OSDN Git Service

am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c: DO NOT MERGE...
authorsmain@google.com <smain@google.com>
Wed, 9 Jul 2014 12:23:46 +0000 (12:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Jul 2014 12:23:46 +0000 (12:23 +0000)
* commit 'afb83c6b3ca9935f7ad89a549105b27fb40f5fdb':
  DO NOT MERGE revise butter bar message for clarity


Trivial merge