| commit | afb83c6b3ca9935f7ad89a549105b27fb40f5fdb | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Jul 08 23:38:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 08 23:38:27 2014 +0000 |
| tree | 63ae35948d2c3d577708e2936e7ee0280a68a330 | |
| parent | a97f675c921efdbc34f33f12c9a523fc898e624f [diff] | |
| parent | 62cf72b03fe2888b2dd80442ad4ec9851ddc431c [diff] |
am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity * commit '62cf72b03fe2888b2dd80442ad4ec9851ddc431c': DO NOT MERGE revise butter bar message for clarity