tree bc0b7413955600ea8e7e5feb72d1553be5c85d0f
parent 94c8b5e5a662116eb8a23fd36c9dc737d4b5e963
parent 3591cb48f5489dbce6db82886b870e884974a274
author Tianjie Xu <xunchang@google.com> 1484879166 +0000
committer android-build-merger <android-build-merger@google.com> 1484879166 +0000

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

Change-Id: I173c8f1c1f68b57b3046f91525c5ac3d3acf184d