Merge "Fix for NullPointerException in CTS media test." into eclair
authorGloria Wang <gwang@google.com>
Wed, 3 Feb 2010 23:53:12 +0000 (15:53 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 Feb 2010 23:53:12 +0000 (15:53 -0800)
commitd86b2b7356154a5b783d7029b239ea8188f707a6
treec69bcd4653eb8dc059e55a9b7bd954e484ddc429
parentf8604d33dfa9e128be87bbf06a3addc2e39fb9ac
parentd1225c04b8c096720de081272bcb2da052ceeb4b
Merge "Fix for NullPointerException in CTS media test." into eclair