| commit | e2625fcce9435ae86841f6dc719147e17b01c00d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Sep 23 02:20:28 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 02:20:28 2014 +0000 |
| tree | 3f0e7a30808b4ffd9b50a3aac4d9e4a9d4993f60 | |
| parent | 79c89b86f5b51508cd47bfad455a6515299579f8 [diff] | |
| parent | c7437dd7c0fd90757698934d199fe864b40254e1 [diff] |
am 56a9f3ac: Merge "I am such an idiot." into lmp-dev * commit '56a9f3ac269c723895948bf524fe378a9afc6636': I am such an idiot.