OSDN Git Service

am 2c5114b8: (-s ours) am eb0c0d3c: am e1f0f4f1: Merge "Delete the captured video...
authorztenghui <ztenghui@google.com>
Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:32 +0000 (18:14 +0000)
* commit '2c5114b81ea373227f9dce4bb4747ba13824d900':


Trivial merge