tree e3d6ed2296d9357466d171e410924ded1424fc5f
parent 9f527d52229c973fddd94b926b803a6be68ae440
parent e7bc1542dbdd76282ad2e37e0ae7ee57e75b723c
author Zach Jang <zachjang@google.com> 1466559673 +0000
committer android-build-merger <android-build-merger@google.com> 1466559673 +0000

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

Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32