tree 75cdee66f673b285d75d5f8ce441264f41e97781
parent 3f41b4666e7a71ddf184f3295bbeeb2d520c52fa
parent a0c11a3effdc257da8d95c3f210a80a57e1f1517
author Wonsik Kim <wonsik@google.com> 1472684370 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472684371 +0000

Merge changes Iafb91645,I56a0ec7b into nyc-dr1-dev

* changes:
  mediarecorder: fix timestamp adjustment for early pause/resume
  Revert "media: Mediarecorder drops the mediabuffer with negative adjusted timestamp."