tree a6a2b28fbd9912cecdbb121129cd208ba0842fb5
parent 8f9e3c9bd988900f15b3d2fe6c4f0b231115bca9
parent 510b13acd87b3b88975617d166412c4e3248f2d3
author Tianjie Xu <xunchang@google.com> 1484884397 +0000
committer android-build-merger <android-build-merger@google.com> 1484884397 +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

Change-Id: I4b0f915faac915a11917ebc8291de0ba782dd76b