tree 724f26c9ce97ccf343d618168d47cda749d49c91
parent 507ea24b8f881f8af42393a0512c88cf7397edb9
parent 2eca1b53ae905f5ddaebaff7156340efdf97cb84
author Elliott Hughes <enh@google.com> 1355612266 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355612266 -0800

am 2eca1b53: Merge "Add return after NULL check in JetPlayer"

* commit '2eca1b53ae905f5ddaebaff7156340efdf97cb84':
  Add return after NULL check in JetPlayer