OSDN Git Service

am a723b07d: (-s ours) am d6a639f3: am fca08fd3: am 47e437de: Merge "Update shutter...
authorMindy Pereira <mindyp@google.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:44 +0000 (18:14 +0000)
* commit 'a723b07d3104a68b23a92a0801d0ba2c31db540b':


Trivial merge