| commit | e022e9a7139a55ed8d9fcc9dca3ffdf37727b164 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Wed Jun 25 19:12:42 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 19:12:42 2014 +0000 |
| tree | 01a75509ae67360a00f90f75609b8567c71c077b | |
| parent | 904446ce0b3f430ac88ae0c08b9c613721474cd5 [diff] | |
| parent | bb9ecf420f136681a3bd4d5503207733b4dc283b [diff] |
am bb9ecf42: undo the butterbar change, because automerger is ruthless * commit 'bb9ecf420f136681a3bd4d5503207733b4dc283b': undo the butterbar change, because automerger is ruthless