OSDN Git Service

am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce
authorJohn Reck <jreck@google.com>
Thu, 16 May 2013 20:54:41 +0000 (13:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 May 2013 20:54:41 +0000 (13:54 -0700)
commitacdef4fa8d98a06b266c37c4fb57e812a0eeab6a
treef12e1ed32f64f65b7e5bfe57d16ab5719cb47775
parent9a4b2f141d9fe35d068a5a629a04eb19a65be754
parent5a9716fe6de7af4585a24dd1d749b38a4ab48195
am 5a9716fe: Merge "Fix reset" into gb-ub-photos-bryce

* commit '5a9716fe6de7af4585a24dd1d749b38a4ab48195':
  Fix reset
src/com/android/gallery3d/filtershow/FilterShowActivity.java