tree 0e443679e800bb442b2cbb2f7ae086b787ca65ff
parent 707d74caa5c30762a89b6a9ab1cf82210482c806
parent fb5baf652189b1f02126736a90c1c61c7d7c1d17
author Xin Li <delphij@google.com> 1487090795 +0000
committer android-build-merger <android-build-merger@google.com> 1487090795 +0000

Merge commit '055aee28cedc3' into klp-dev: am: 2051465f2e am: d7cab14288 am: cafd00b375 am: 4cea75b987
am: fb5baf6521

Change-Id: I2e7c4296eba364189e741b7d61a7ff8bd747d127