OSDN Git Service

resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6a...
authorNick Kralevich <nnk@google.com>
Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Oct 2015 04:26:07 +0000 (04:26 +0000)
commit69b8174c5e184d0a314821d24893e931946ede83
treec946b379b3930b220eb0dd551dcc5fb1c7ab58dd
parentcd9aad3a95c1fbb3062abada8cb851a41e79556d
parent6eac97d4baf77954c7d862e7bf35ed3763543491
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8
am: 6eac97d4ba

* commit '6eac97d4baf77954c7d862e7bf35ed3763543491':
  DO NOT MERGE: fix build breakage