tree b62177939992b8b2a7c8030fe7faad9a2e5d4ce1
parent a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac
parent a11aeeb36560959db321f9757d4c5eccfdfa7f63
author Justin Ho <justinho@google.com> 1316207704 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1316207704 -0700

Merge "Adding selected state for scrubber control" into ics-factoryrom