OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:22:19 +0000 (23:22 +0000)
commit203d1bee2514abfeba3707f64eb741fcf58e3adf
treec37ef4fa3370991550f35e04eb5bb6d25dab03ee
parentc35a9fed3900844935faa19d8d59b96c49e4bae2
parent77dec89bb3895ffc1d486f48d6722a4d3942b129
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3 am: c2a760e68c
am: 77dec89bb3

Change-Id: I1d755ef86b80f723c3fde59476e0018167fbf8b7