tree 622b25b950685f333198e234d762adf7137f59b8
parent fa432cf4c5358a1b1d039fceecb6b6bb70bf66f0
parent be2e0e882427915f3a8bdb5033c4e0795ecaafaf
author Ray Essick <essick@google.com> 1546968174 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1546968174 +0000

Merge "Synchronize mediarecorder.h and MediaRecorder.java"