tree ac8fa1c4076d99125b4353eca096ea5d209361e5
parent 92536ac3ba54aa13d28b1af957e78d4d3af798a1
parent 3ae114e72617f2faea281d82f7f4ee026d8c5674
author Makoto Onuki <omakoto@google.com> 1314305201 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314305201 -0700

Merge "Two fixes for custom filter activity."