tree d3a7de1db462ecfa002e5846f50761eab1765808
parent bf5d08ecf4cce47611ee58dbe6b0685e04725c87
parent cbf1e2cc945ca1a5d70b6e8c213c4c7a428b9090
author Zach Jang <zachjang@google.com> 1466559203 +0000
committer android-build-merger <android-build-merger@google.com> 1466559203 +0000

resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29
am: cbf1e2cc94

Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5