OSDN Git Service

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


Trivial merge