OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Mon, 22 Aug 2016 22:33:10 +0000 (22:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 22 Aug 2016 22:33:10 +0000 (22:33 +0000)
commitf21534a288975f6d251c55b937a870ac2b61278a
treeaa81a097ad80152293d4ae020c8ca2b549547147
parent03b0f5c3ec1eb066396652e123f568d78ce169c6
parent6a5027094470a7db4b714151622df6818172ec2f
resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9
am: 6a50270944

Change-Id: I55fa6f6719a4ce3358ca7ba9f0244fb4ada96368