tree 2a0dfdf87bc50cae5a930bf3856e66ecc367ae9a
parent d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486
parent a57ae3f43864d3690908b084fdc7c638f45bf6c9
author Adam Powell <adamp@google.com> 1285969600 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1285969600 -0700

Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread