tree 953cb3fa0322e9b3facc68631aeba6b4ed8bbbad
parent 55eb6566c5818f4c6d4c03d3b011179aa680e2ce
parent 1628b3760f0cae69046b61b37fb9bb238ec62f79
author Robert Shih <robertshih@google.com> 1437842912 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437842912 +0000

am 1628b376: am 6134ad6f: Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev

* commit '1628b3760f0cae69046b61b37fb9bb238ec62f79':
  NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio