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)
* commit 'f2697daa3a5f114216488022ca513cb7811075b9':
  Make sure canceling a filter does not undo previous filter.


Trivial merge