| commit | 9ec978732f8dd82e7adef3e37097eaca3fbd65f0 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 01:52:34 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 01:52:34 2015 +0000 |
| tree | f8659c6433a0d49cfd756c4a72a9bd967ab455f2 | |
| parent | 90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd [diff] | |
| parent | fa632f6ad7be6b1f488dd3d1b825a82456db5097 [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 * commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097': DO NOT MERGE: fix build breakage