| commit | 0370a03b6e74e40d5110b83fed2243bf072aee73 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 04:15:24 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 04:15:24 2015 +0000 |
| tree | 6a0178fff3a8aff0986c89cc2ab9a13de732cfb0 | |
| parent | a82ace99f76ed815e16ab64eae2e9e55871a8b8f [diff] | |
| parent | 1b28b05d2edf11f49717b53cd49a9161892f0388 [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e * commit '1b28b05d2edf11f49717b53cd49a9161892f0388': DO NOT MERGE: fix build breakage