| commit | 3c4b7c568d5de16b738207e581e9cd48e4eb6529 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Mon May 20 14:09:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 14:09:25 2013 -0700 |
| tree | 23b426b5974fc2eeb65b14ba655c1c79760d7796 | |
| parent | 875da35b7b769a66edb8f25db4780a8c63aa3a4e [diff] | |
| parent | d54f6082ca219c82a525553e2a405cbca92e9dfb [diff] |
am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce * commit '7af7156a809934951877b1f9b9ad1ceeb9c9a5ce': Make sure canceling a filter does not undo previous filter.