OSDN Git Service

Merge "Increase MediaSource's startup timeout."
authorEino-Ville Talvala <etalvala@google.com>
Wed, 3 Aug 2011 21:01:17 +0000 (14:01 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 3 Aug 2011 21:01:17 +0000 (14:01 -0700)
commit3472098010581e4cbf3f7fadf15f03de75c9a51d
treeb5a900b2eeedc022ee4fe3a4951cba5ddfda0a78
parentc2ab83c3be33a48d47b10c9c141e7ef2180956a5
parentfa2124c46e4e6486465f6b85db7e6780eda46c3b
Merge "Increase MediaSource's startup timeout."