tree b9e65ba8519ce966b4093855e48a7726fee61d3c
parent 174427e6c97ae75060d4a8ea86ff951ef94f2dcf
parent 6db76e8b8f561355198fc91dd95498a59ad38a20
author Marco Nelissen <marcone@google.com> 1366668991 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366668991 -0700

am 3030f344: Merge "Fixed the wrong timestamps issue about camera recording"

* commit '3030f344e77d14cf688c34f79c83a045c888825d':
  Fixed the wrong timestamps issue about camera recording