tree f90c7c7c1e65b8ad4279dfe4883e46a80e0a7321
parent 8953f919e402b12ed24c8c4616f993043dfa471d
parent 3d1f19c73334a0fba3d06ddc4d010ec7ff074c1c
author Tianjie Xu <xunchang@google.com> 1484884930 +0000
committer android-build-merger <android-build-merger@google.com> 1484884930 +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

Change-Id: I4c3c665cb6aac08125817f26d788f9fb82b3ca92