Merge "Suppress implicit-fallthrough warnings in mediarecorder." am: fd53bf2f59 am: 5c1de015ad
am: 92d2576a31

Change-Id: I5bd4471c15c08216583d12e9e5bb281053794580