OSDN Git Service

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6 -s ours am...
authorSudheer Shanka <sudheersai@google.com>
Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 00:06:01 +0000 (00:06 +0000)
commit1c153c697b632d323735f69156fc77680d0c49d7
treec9afd6499b01c4bc010df4f1eccc6f1360aeb5aa
parent2c18f32328dacf6e7721824d6d7026a1563a6873
parentc18b88c15d1422840d68dcb79d8844159ff655c9
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 am: 203d1bee25 am: 7a46fac0cd am: d57565864b
am: c18b88c15d

Change-Id: I67b766b5c658101cffc4ef53db67685709aec072