| commit | 709e9b8d82e346c2af7214c97bfd7316c937876c | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Tue Oct 07 17:32:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 07 17:32:53 2014 +0000 |
| tree | a71286416890b7bb9d974235a31dd2fef913fe40 | |
| parent | 0ba58d98e9abdbee33a6cfe8186cd531d3b7f0a2 [diff] | |
| parent | ee2cf90a3339647a497310c8ad17fe8a25af8f7e [diff] |
am ee2cf90a: am cb4a6984: (-s ours) merge in klp-release (no-op) * commit 'ee2cf90a3339647a497310c8ad17fe8a25af8f7e':