tree b9b8608a2a6543d014d41f0c652fde9d1e5c7a56
parent aaf301736e923db15918617145069658696be453
parent 2357858a1d22d9132155a3272b26a60e3ea967f0
author Justin Ho <justinho@google.com> 1316390172 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316390172 -0700

Merge "Properly adding scrubber pressed/selected state" into ics-factoryrom