| commit | 4bc8177434826dbd58b3f365edbd7c7d27d80e9e | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Jun 25 20:45:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 20:45:52 2014 +0000 |
| tree | 59d198f6e0f139770b47ffe5488966d0465b60ae | |
| parent | 0e9f646d39a625aec47db151e7955022bfbfcef1 [diff] | |
| parent | e022e9a7139a55ed8d9fcc9dca3ffdf37727b164 [diff] |
am e022e9a7: am bb9ecf42: undo the butterbar change, because automerger is ruthless * commit 'e022e9a7139a55ed8d9fcc9dca3ffdf37727b164': undo the butterbar change, because automerger is ruthless