tree b764de0ac1cf8f524e97a1b1da95e674ffa1b905
parent 3d58e326d9bb0287a9851e375dd77d57c86d7eda
parent 288166cbb2c44a9a287f29c87fb59477f6df151e
author David Christie <dnchrist@google.com> 1471032594 +0000
committer android-build-merger <android-build-merger@google.com> 1471032594 +0000

resolve merge conflicts of b4a5615 to lmp-dev
am: 288166cbb2

Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255