tree 3cc2d750c86189f15be32c69115d93e34172447f
parent d0bfa33c664405957733e01ec0e8c17bf1234b4e
parent 8e267878cca7785a3ec41c5160888bec65091fb3
author Tianjie Xu <xunchang@google.com> 1484885142 +0000
committer android-build-merger <android-build-merger@google.com> 1484885142 +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

Change-Id: I5cff676ac1b93c413cd8b339d7cf62ca7fbc650f