| commit | 2d325b7e0c6f853fe6edb219f336b2939f40d344 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 04:32:47 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 04:32:47 2015 +0000 |
| tree | 31fb8b7b981af6d8251778d254d460fdd0a4fa9f | |
| parent | b6c784bbd8ce1676afa5a6741b85e0d1e52fa514 [diff] | |
| parent | 09be485667fc96df24d2e2ab6ce4fc4f26588739 [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 am: 09be485667 * commit '09be485667fc96df24d2e2ab6ce4fc4f26588739': DO NOT MERGE: fix build breakage