| commit | 09be485667fc96df24d2e2ab6ce4fc4f26588739 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 04:30:05 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 04:30:05 2015 +0000 |
| tree | a124eed9e4674f044a30735be9d86608483eaf80 | |
| parent | ce12ffb0176f1ed42caf82ad07996c06f556a582 [diff] | |
| parent | 69b8174c5e184d0a314821d24893e931946ede83 [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8 am: 6eac97d4ba am: 69b8174c5e * commit '69b8174c5e184d0a314821d24893e931946ede83': DO NOT MERGE: fix build breakage