tree ad48ccea2c67b5c5bb14d2f7a06cb2456958c698
parent 4eb04cb32b58f4f204edcca5e20b6dd24855e30a
parent 3a53e2ce0440ca58ec00ead43c92e285452f1d1c
author Narayan Kamath <narayan@google.com> 1474480469 +0000
committer android-build-merger <android-build-merger@google.com> 1474480469 +0000

resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7 am: b5f75c4582 am: af43cd033c  -s ours am: c681771b97 am: de03f5ac26 am: 7d106d5999 am: b8f35dd70b
am: 3a53e2ce04

Change-Id: I2bc67485c0f92960b0124067a3e9e1cd8438e712