tree aae66bcb4992b1ef9714c5b081a7e4334d4f4ff0
parent da1090097765f736474458981034f823de8c4f7f
parent a2c8d40185095a1905f0063ebeb51ff62c0a0ab1
author Wei Huang <weih@google.com> 1320702050 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1320702050 -0800

Merge "Change effect settings popup styles." into ics-mr1