OSDN Git Service

am 49a723a5: am afb83c6b: (-s ours) am 62cf72b0: am 60d43dde: (-s ours) am 97539b1c...
authorsmain@google.com <smain@google.com>
Mon, 14 Jul 2014 20:43:52 +0000 (20:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:43:52 +0000 (20:43 +0000)
* commit '49a723a514de66318de334aeff8cce1a0ac1384b':
  DO NOT MERGE revise butter bar message for clarity


Trivial merge