tree 5f617083756b53f9b3cdce2c329d12754e5e5c98
parent c2b3d0008432c06ce43a4d93fa1fde1343a6dc65
parent 006baced4746ddaf31fbd170bcb76abc5f1f8325
author Wei Huang <weih@google.com> 1321290929 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321290929 -0800

Merge "Fix several UI bugs." into ics-mr1