tree 1a93cb8c4ea4ecaf8f9c5f7969ff6238f88291f8
parent 7da048d31f348d27abc0067a94e5b43efdfd718d
parent 93db35d207dfc43e45bd2388548d432cb85ab81f
author Gloria Wang <gwang@google.com> 1265408428 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265408428 -0800

am 93db35d2: am d86b2b73: Merge "Fix for NullPointerException in CTS media test." into eclair

Merge commit '93db35d207dfc43e45bd2388548d432cb85ab81f'

* commit '93db35d207dfc43e45bd2388548d432cb85ab81f':
  Fix for NullPointerException in CTS media test.