| commit | f42356b1d265bf89213be687dc6ac07f6e69777f | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Sun Apr 26 22:02:20 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 26 22:02:20 2015 +0000 |
| tree | b74aa191ac219c45a56f93a9e56a4d76bd396e4f | |
| parent | c56072a0f28ded3787294f99a29cbdda67220f49 [diff] | |
| parent | 81d7698fc2e18ebf3753e0b13f3a4e4d580eaf1f [diff] |
am 81d7698f: (-s ours) am eaecbd06: am 398e29e1: merge in klp-release history after reset to klp-dev * commit '81d7698fc2e18ebf3753e0b13f3a4e4d580eaf1f':