OSDN Git Service

am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless
authorsmain@google.com <smain@google.com>
Wed, 25 Jun 2014 20:45:52 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 20:45:52 +0000 (20:45 +0000)
commit4bc8177434826dbd58b3f365edbd7c7d27d80e9e
tree59d198f6e0f139770b47ffe5488966d0465b60ae
parent0e9f646d39a625aec47db151e7955022bfbfcef1
parente022e9a7139a55ed8d9fcc9dca3ffdf37727b164
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless

* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
  undo the butterbar change, because automerger is ruthless