OSDN Git Service

Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
authorJason Noguchi <jnoguchi@google.com>
Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)

Trivial merge