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:13:08 +0000 (01:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Aug 2016 01:13:08 +0000 (01:13 +0000)
commit42cc00c5d922e19b6153c9f9bc264f9470d45722
tree4a2cc502be3037cc3751e034a1ba03703f3997b3
parentb8dde176dbb6dcec6b6c855fce16a3b563938588
parent80ce19c380dca47f9236df71ba109a23a235aa8f
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: 80ce19c380

Change-Id: If61f0efa94d8aa22aa2ed32af29478350ca5ffa0