tree b5a900b2eeedc022ee4fe3a4951cba5ddfda0a78
parent c2ab83c3be33a48d47b10c9c141e7ef2180956a5
parent fa2124c46e4e6486465f6b85db7e6780eda46c3b
author Eino-Ville Talvala <etalvala@google.com> 1312405277 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1312405277 -0700

Merge "Increase MediaSource's startup timeout."