tree 95e962c2069376427bc3c57ffa878a73bd75150e
parent 984a54322f7c70bc75e862d91bdd975814872aff
parent 701d342f785e407c8e6bcb046658f84ac56d989a
author Lajos Molnar <lajos@google.com> 1433978651 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1433978651 +0000

Merge "mediaplayer: remove use-awesomeplayer developer option" into mnc-dev