tree 1d293ccc12faae0a31ab9da9bc314864cd41f64c
parent 36d5ca4ff1b8ba5c5b9937d46b03a7b41a8a8857
parent 5afa50bca331f7ac29002f97421abf276919f2d6
author Jean-Michel Trivi <jmtrivi@google.com> 1308960016 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308960016 -0700

Merge "Fix NPE in audio decoding"