| commit | 9dd2bd1a73040b6a3051b7f8c49a6a398a07d7bd | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Sun Apr 26 21:59:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 26 21:59:28 2015 +0000 |
| tree | b74aa191ac219c45a56f93a9e56a4d76bd396e4f | |
| parent | 061a3869c7e9f2cb66fdb5fac33a7d1f1a472da1 [diff] | |
| parent | 7b35c03e3595455f63bedaa51f39271624005209 [diff] |
am 7b35c03e: (-s ours) am 741c1130: (-s ours) merge in klp-release (no-op) * commit '7b35c03e3595455f63bedaa51f39271624005209':