commit | d05907cb3e7d7102b4cde172d41cb45d1143f21d | [log] [tgz] |
---|---|---|
author | Jason Noguchi <jnoguchi@google.com> | Tue Apr 03 18:11:24 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 03 18:11:24 2012 -0700 |
tree | 82e2b83c5fac7f0cbf2b113a06d0055c5e9d9edd | |
parent | 44361704606ce261870637bd3af0f1ba7c5e5b39 [diff] | |
parent | e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee [diff] |
am e371ed8d: am 6e6d8df5: Merge "Adding camera zoom test to mediaframework stress suite." into ics-mr1 * commit 'e371ed8de54c42d2e0b8aa3fb7196670ff5ae9ee':