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:07:56 +0000 (23:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:07:56 +0000 (23:07 +0000)
commitc2a760e68c891c8baeae66cf5837e4025bc68736
tree68e6f19861c25262021ba27b96d3368b93d1996d
parent603a69ffb4b015da82a91b5e507c2f83a4a3f8ec
parentcdf70ba0a3c7d4fcfea0adbae9d6dd3f38678747
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58
am: cdf70ba0a3

Change-Id: Ia7c597b1b96e65cce89396a6b509a796bb17bc2c