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