OSDN Git Service

am 24d8850e: am 62ab53eb: am 463b918e: Prevent edit during view photo intent
authorJohn Hoford <hoford@google.com>
Mon, 16 Sep 2013 23:07:47 +0000 (16:07 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 16 Sep 2013 23:07:47 +0000 (16:07 -0700)
* commit '24d8850ea56e79e7f3e013eb93b324971ed57b27':
  Prevent edit during view photo intent


Trivial merge