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:39:59 +0000 (23:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 23:39:59 +0000 (23:39 +0000)
commitd57565864b5c1774e18d34889e09e8151d195044
tree3f8ad6ade69597a88324b3be622473a6c69bdd95
parent02ba5ef875e712efb9dd3b0056b1791cf7c2f732
parent7a46fac0cd843c955d50e30af097f3e447da5a9b
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

Change-Id: Ib35ca340d72a71b8cd9ae6d850375012461977ad