tree d24123c97e5c88dbf28c1cf665e6ad58ce5db8c7
parent 3337819ff2d3e9c70b6cce7104a62a0abdcdffe0
parent 9af09c0505ed52d5aaa8a8bf9accd942a4303260
author Tianjie Xu <xunchang@google.com> 1484890898 +0000
committer android-build-merger <android-build-merger@google.com> 1484890898 +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: e4dcbd1c9e
am: 9af09c0505  -s ours

Change-Id: I4701616a9c3d5e7237e23942ffdf05d696b61d6e