OSDN Git Service

am e3903c3b: (-s ours) am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:40 +0000 (18:14 +0000)
commitcce20862065be2fd78dae99a90de99d6ff5bc2cf
tree3804e07840427a842ef1bdc750bffe2239123c26
parentf9fa956c7dff1d80c13ec8daa95b7e561a3517c1
parente3903c3b848309747b433f14b67894364f4ec591
am e3903c3b: (-s ours) am 2e63f2e6: am 5f16c140: am 5bca6f4c: Merge "Don\'t allow actions on items in progress." into gb-ub-photos-carlsbad

* commit 'e3903c3b848309747b433f14b67894364f4ec591':