| commit | fa632f6ad7be6b1f488dd3d1b825a82456db5097 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 01:44:26 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 01:44:26 2015 +0000 |
| tree | 287cc26a71f2a901393076ff1928104cb313af9b | |
| parent | 9964d83869565cf4dda432129cfe50f6ede19338 [diff] | |
| parent | 7f1ea80d65996ab687ff56a884da915535cdc176 [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 * commit '7f1ea80d65996ab687ff56a884da915535cdc176': DO NOT MERGE: fix build breakage