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 01:02:18 +0000 (01:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 01:02:18 +0000 (01:02 +0000)
commit80ce19c380dca47f9236df71ba109a23a235aa8f
treec5a01c86341887b1a7fa57bb5af08c8515055fa1
parent7c17f2ee60506f16de0f7a8e4229e1c619cf020b
parentd57565864b5c1774e18d34889e09e8151d195044
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

Change-Id: I84e59e27d3a92d3df1d901cfc57e5066c0e94139