tree 7e283ddab8120c238cd73632cb7ec3e66e718ca4
parent 8bb372d8c259cf62214182c780ccbe73f37875a7
parent a9fc9b3e78d087a1c1c8753e36d12178df3f1fa0
author Eric Fischer <enf@google.com> 1328897327 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897327 -0800

Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/packages/apps/Gallery2 into ics-scoop-plus-aosp