| commit | 3e094bd9cfa660637433474d38cb493221d1931d | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Sep 23 15:51:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 23 15:51:19 2014 +0000 |
| tree | a21d6f61393e6b09a1b118a90104fef90842874f | |
| parent | 51f0290a422fa1e7fcc973e6caa4220cfd86886d [diff] | |
| parent | 4a3b843f8ce73daf6b1af3656b1346139197c9bb [diff] |
am 5e956370: am 77b6a9bf: am 2b2e213c: am 56a9f3ac: Merge "I am such an idiot." into lmp-dev * commit '5e956370a5aea436bd18c490f6c3ac8061d62e89': I am such an idiot.