| commit | 49a723a514de66318de334aeff8cce1a0ac1384b | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Jul 09 12:23:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 09 12:23:46 2014 +0000 |
| tree | 604670ff0dc915c04ffba46cf5d07891681557cd | |
| parent | 3abc2a392664fd08288d39513fc41182af7fefaf [diff] | |
| parent | afb83c6b3ca9935f7ad89a549105b27fb40f5fdb [diff] |
am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE revise butter bar message for clarity * commit 'afb83c6b3ca9935f7ad89a549105b27fb40f5fdb': DO NOT MERGE revise butter bar message for clarity