tree 6199a1cc963c610149efb737043fdaee80244f08
parent 4aa56ad47760d5d01b9f4f202c9080f4865d3e2f
parent 99e38bf25486e44a4688cb28d7503e45b339f4c3
author Tianjie Xu <xunchang@google.com> 1484885321 +0000
committer android-build-merger <android-build-merger@google.com> 1484885321 +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

Change-Id: I3ba0b154e71535e0528c0117728c3b1fee0f20d3