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.
tree: 1a93cb8c4ea4ecaf8f9c5f7969ff6238f88291f8
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk