| commit | 6eac97d4baf77954c7d862e7bf35ed3763543491 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 04:23:35 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 04:23:35 2015 +0000 |
| tree | c946b379b3930b220eb0dd551dcc5fb1c7ab58dd | |
| parent | 928a4879e4a2b996bccf007d390f7f2719e9a901 [diff] | |
| parent | 18e7c64ea82e002978ef069884d195e02e7302df [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8 * commit '18e7c64ea82e002978ef069884d195e02e7302df': DO NOT MERGE: fix build breakage