| commit | b42ca0d1a17560bc564c1de9c54a99ea0889d6b9 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 07 18:33:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 18:33:46 2014 +0000 |
| tree | a71286416890b7bb9d974235a31dd2fef913fe40 | |
| parent | 0f1c7b6c1cf9fbdb85ceed5de51d5e41183b3607 [diff] | |
| parent | 5a29780bca17f8d4282d77621868c9233e703cf1 [diff] |
am 5a29780b: am 709e9b8d: am ee2cf90a: am cb4a6984: (-s ours) merge in klp-release (no-op) * commit '5a29780bca17f8d4282d77621868c9233e703cf1':