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:14:09 +0000 (23:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:14:09 +0000 (23:14 +0000)
commit77dec89bb3895ffc1d486f48d6722a4d3942b129
treeaf858ad3db5ae254435d009153b7a8e98fe9e91b
parent97194798abd70c09a274a1539fb52767477dfef6
parentc2a760e68c891c8baeae66cf5837e4025bc68736
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
am: c2a760e68c

Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520