am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless

* commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164':
  undo the butterbar change, because automerger is ruthless
This commit is contained in:
smain@google.com
2014-06-25 20:45:52 +00:00
committed by Android Git Automerger