| commit | 69b8174c5e184d0a314821d24893e931946ede83 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 04:26:07 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 04:26:07 2015 +0000 |
| tree | c946b379b3930b220eb0dd551dcc5fb1c7ab58dd | |
| parent | cd9aad3a95c1fbb3062abada8cb851a41e79556d [diff] | |
| parent | 6eac97d4baf77954c7d862e7bf35ed3763543491 [diff] |
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