OSDN Git Service

am 4df74700: (-s ours) am 4aac7d25: am 33bb2d47: Merge "Bring back wide angle panoram...
authorAngus Kong <shkong@google.com>
Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:27 +0000 (18:14 +0000)
* commit '4df7470055b9e431987a561e57904848d35dc37a':


Trivial merge