OSDN Git Service

resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)
commit9ec978732f8dd82e7adef3e37097eaca3fbd65f0
treef8659c6433a0d49cfd756c4a72a9bd967ab455f2
parent90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd
parentfa632f6ad7be6b1f488dd3d1b825a82456db5097
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7

* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
  DO NOT MERGE: fix build breakage