tree 5e6bcdbdb9be3d63393ae0481a699f6cbc55f6d9
parent 5d77e7e0c1425c8d1ed60dd5425267ce79ef4648
parent 3749025ccbbc0776fe10c5813262ed771e7185b6
author Zach Jang <zachjang@google.com> 1466559511 +0000
committer android-build-merger <android-build-merger@google.com> 1466559511 +0000

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

Change-Id: Idadb32ede7b3699e0db8ce632d37e7d2cf99e82b