tree e659fe06c88346af14c0bc405de917cdba8c1ab4
parent 87f5744d09063f7bbccf6396df36c566c7765431
parent 13c6b61616d43912996be3302ab2d02ca2b51a99
author Wei Jia <wjia@google.com> 1457041171 +0000
committer android-build-merger <android-build-merger@google.com> 1457041171 +0000

Merge "MediaPlayer: use local variable to check member is null." into nyc-dev am: ebdc198e2f
am: 13c6b61616

* commit '13c6b61616d43912996be3302ab2d02ca2b51a99':
  MediaPlayer: use local variable to check member is null.