tree b6ffc11f3c097c206906ad2d2410c550a07dfcbe
parent 8f56bd1ef1be2156141aa6dbcbaf18751ad24bcb
parent 0cbbcc6f02226837749a40962f6f36a51bb571d8
author Marco Nelissen <marcone@google.com> 1570235024 -0700
committer android-build-merger <android-build-merger@google.com> 1570235024 -0700

Merge "Remove more remnants of MediaPlayer2"
am: 0cbbcc6f02

Change-Id: I1b7aa2d94c1ea863a003443ef01d5712013b40e6