tree 7eca042f8c835574b443c0012e07588c13ac8869
parent f859652e5f3c021b36b4b25fdf89c73df051a626
parent 99e38bf25486e44a4688cb28d7503e45b339f4c3
author Tianjie Xu <xunchang@google.com> 1484885322 +0000
committer android-build-merger <android-build-merger@google.com> 1484885322 +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: Id8c4d672f5edbe5b12efa8350588ae088bbe595b