OSDN Git Service

am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous...
authorSascha Haeberling <haeberling@google.com>
Mon, 20 May 2013 21:11:35 +0000 (14:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 21:11:35 +0000 (14:11 -0700)
commit4925d79902524b506c04aa769c6aa3788a7be2d0
tree10accd972d9beb639c14c0ef64171ea008a4d932
parent706ed7ebf21b5936b2d5b908a239be3e05160518
parentf2697daa3a5f114216488022ca513cb7811075b9
am f2697daa: am 7af7156a: Merge "Make sure canceling a filter does not undo previous filter." into gb-ub-photos-bryce

* commit 'f2697daa3a5f114216488022ca513cb7811075b9':
  Make sure canceling a filter does not undo previous filter.