| commit | 5e1d22850343847080f086266e5d0f8b7a91badd | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Sun Apr 26 21:57:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 26 21:57:57 2015 +0000 |
| tree | b74aa191ac219c45a56f93a9e56a4d76bd396e4f | |
| parent | 02627821771bac14eb1a352a9b3605cf49232bba [diff] | |
| parent | 642defd282484aa51ff0ac2021bc435347c06f07 [diff] |
am 642defd2: (-s ours) am 48b4097b: (-s ours) merge in KQS81M * commit '642defd282484aa51ff0ac2021bc435347c06f07':