| commit | ff7f43eb08e3f2d98e7b8f09e733ef015e3fe168 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Fri Sep 20 18:29:16 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 18:29:16 2013 -0700 |
| tree | 345e105d5342fe177753ddd6f5e0ddcda1493dc5 | |
| parent | 28db9c64172c046118eede06a5cc6f8d729c50c8 [diff] | |
| parent | bb6fd7ff8cec893999b26e39dc62f1b4b4b9a8ea [diff] |
am bb6fd7ff: Merge "Shut. Up." into klp-dev * commit 'bb6fd7ff8cec893999b26e39dc62f1b4b4b9a8ea': Shut. Up.