tree 4096aacaa52e6ff8fde1d06eebc6da927816e41d
parent cfdd52423cee9efea73023feeaa74279ebd45b7c
parent 43cc944ecdc1634dccd92a1aad559f0caa13b53c
author Chong Zhang <chz@google.com> 1429132772 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429132773 +0000

Merge "fix NuPlayerDecoder discontinuity handling with async mode"