tree 1f0d342cbed2ea50622e9a4e941d45ace6afca65
parent 569c5d1f09842dcea808be028dc74430e7197d65
parent 5f07bee4543a70fe305e79d048ad9e5ec4235d23
author Adam Powell <adamp@google.com> 1285978063 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285978063 -0700

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

Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'

* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.