| commit | 62cf72b03fe2888b2dd80442ad4ec9851ddc431c | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Jul 08 23:34:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 08 23:34:10 2014 +0000 |
| tree | 057adccdf15cbba60b8f0920e080125bae0267e1 | |
| parent | 236738439acab7c9b2afc2725b44c4867597ed7f [diff] | |
| parent | 60d43ddecf8f582348685f4bfc5cd980dca9a1ba [diff] |
am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity * commit '60d43ddecf8f582348685f4bfc5cd980dca9a1ba': DO NOT MERGE revise butter bar message for clarity