tree 1e862b18f9e4b75a6404e2c5eb983e015d40fe95
parent 81177b50d95a4c7ae7ef22aae04456cc73b846a7
parent 78d4d1e46c546a29ec86b98f4bfce71424c42213
author Wei Jia <wjia@google.com> 1463438240 +0000
committer android-build-merger <android-build-merger@google.com> 1463438240 +0000

Merge "NuPlayer: reduce calls to getFormat()." into nyc-dev
am: 78d4d1e46c

* commit '78d4d1e46c546a29ec86b98f4bfce71424c42213':
  NuPlayer: reduce calls to getFormat().

Change-Id: Ie9faf740957ca0b9d47a91ef1396a025b41d4ec0