| commit | af74944bcc98dc6488db0bec78ea11f7b56b3c23 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Mon May 12 23:25:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:25:26 2014 +0000 |
| tree | 9cce7b722ad9cb5cb18795fa6e2f59664ec02cd4 | |
| parent | a9ecffaffcaacecc305085dc204551f9202b61cd [diff] | |
| parent | 813b4f27b7d414d110d0ab6f81839204c2b7d124 [diff] |
am 813b4f27: (-s ours) merge 601d39b688bcbb1789e145d1b72753206c24d374 * commit '813b4f27b7d414d110d0ab6f81839204c2b7d124':