tree 7eca042f8c835574b443c0012e07588c13ac8869
parent a727d151d404ba217bd59ea577b14b7b1c522f6d
parent 87f49b83caa6b40ec8c8ae2a2e89c598ce6d233a
author Tianjie Xu <xunchang@google.com> 1484885908 +0000
committer android-build-merger <android-build-merger@google.com> 1484885908 +0000

DO NOT MERGE: resolve merge conflicts of 5346da02 to klp-modular-dev am: 4eb997d52b  -s ours am: 3591cb48f5  -s ours am: 8bdb13dd9a am: 0d750f900b  -s ours am: 457ad2dc3c am: d1c3bdd8c2 am: 9930b28456 am: 0a627e5a5f  -s ours am: 510b13acd8 am: 3d1f19c733 am: 8e267878cc am: 99e38bf254
am: 87f49b83ca

Change-Id: Ib02c4fddda47bae1c082df0502e94ad7cd3b0417