OSDN Git Service

am 06ebb079: am 26b224dd: Protect video recording callback from activity/module pauses
authorAlan Newberger <alann@google.com>
Fri, 15 May 2015 17:33:11 +0000 (17:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:33:11 +0000 (17:33 +0000)
* commit '06ebb079393fab517589249c8de507e0629167a9':


Trivial merge