tree 4f3c4cff0e317310b717f559dc12d33c6f799d03
parent 016d3ceac23d73ab57e644b961b02ebd5536e756
parent 4c2a62edb6506eff4ddb7627f7e09153206cd179
author Wei Jia <wjia@google.com> 1491602046 +0000
committer android-build-merger <android-build-merger@google.com> 1491602046 +0000

Merge "MediaPlayer: hide BufferingParams API" into oc-dev
am: 4c2a62edb6

Change-Id: Ib1b36bf7efe6aea88fa3f370e6e20d897c98b734