| commit | 1b28b05d2edf11f49717b53cd49a9161892f0388 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Fri Oct 23 02:02:42 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Oct 23 02:02:42 2015 +0000 |
| tree | b43ee84a8ddb15c83dadcd7225e578ff4fedc49d | |
| parent | 9830f11dc6b6aa4001c79147966fdb9eaa71c2f2 [diff] | |
| parent | 9ec978732f8dd82e7adef3e37097eaca3fbd65f0 [diff] |
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f * commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0': DO NOT MERGE: fix build breakage