commit | f2697daa3a5f114216488022ca513cb7811075b9 | [log] [tgz] |
---|---|---|
author | Sascha Haeberling <haeberling@google.com> | Mon May 20 14:09:27 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 20 14:09:27 2013 -0700 |
tree | 5fd50d7e111b59c3171c9b4496343644a2eeec0f | |
parent | 22fcfeb20d601ca73dcfa374a46d3b370bef1929 [diff] | |
parent | 7af7156a809934951877b1f9b9ad1ceeb9c9a5ce [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.