tree bc0b7413955600ea8e7e5feb72d1553be5c85d0f
parent 2b1bcab427a6f05297f2796ad47ab7732dbb25b8
parent 8bdb13dd9ae166b55ec3a1057baae3f72f0691c5
author Tianjie Xu <xunchang@google.com> 1484879707 +0000
committer android-build-merger <android-build-merger@google.com> 1484879707 +0000

DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b  -s ours am: 3591cb48f5  -s ours
am: 8bdb13dd9a

Change-Id: Ieb6efb9b8efec556f401325fb8449e56b2f9d4bc