OSDN Git Service

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


Trivial merge