am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other...
am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread
Merge commit 'bbf00cfb'
* commit 'bbf00cfb':
DO NOT MERGE Fix bug 3026771, other design/asset fixes.