tree 0b5675a90608bcf6063eda39659827b7cab6d00d
parent 3b47a711843a40a8c2bbdac0066521f6b794dec4
author Brian O'Connor <bocon@onlab.us> 1426718581 -0700
committer Brian O'Connor <bocon@onlab.us> 1426718880 +0000

Mirroring changes from mainline repo:

Change-Id: Ic027f97f8fce6c673c9f2c02a92abaeedfedeb97
Change-Id: I5366a05d657ceaad18c03b95cd71f5d1107200e2

# this patchset's changeid
Change-Id: I446e6afcb561669f95edb7de7974ac9899644168