tree a51361928edbfe6714d2b98fd0a0e291aff94caa
parent 78fe845ddab5d2e430d47c1d99499519edb9b95e
parent 4c74fde2ef5b582196b296a8263cd39143e7abca
author TreeHugger Robot <treehugger-gerrit@google.com> 1472265775 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472265775 +0000

Merge "NuPlayerRenderer: fix racing condition for offload mode." into nyc-mr1-dev