OSDN Git Service

am eef0ca49: am e56abc70: prevent editing of GIF
authorJohn Hoford <hoford@google.com>
Fri, 20 Sep 2013 23:27:39 +0000 (16:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Sep 2013 23:27:39 +0000 (16:27 -0700)
* commit 'eef0ca494583fe37504d12efe4b8f1c7d6ccb8bd':
  prevent editing of GIF


Trivial merge