| commit | 8d6b03673c2c9a6e181b92759ecbc1cdbc975266 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Tue Sep 15 00:50:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 00:50:46 2015 +0000 |
| tree | 0563c256f47093fb7f718fd62c96e358b1b5aba7 | |
| parent | 2825e46999a4565eb7d58d024c4f684481ba9b1c [diff] | |
| parent | a4015498af708145796aacbccc1b722d42c6bc04 [diff] |
am a4015498: am 785be5bf: am 2f3ff158: resolved conflicts for fee166c4 to klp-modular-dev * commit 'a4015498af708145796aacbccc1b722d42c6bc04':