tree 7109b7c590ad1175770da26507cea19c60a61ffe
parent 973f553be4aabf9656d6c1596b47767896677b0a
parent b05a600352dcd4517c62c7503edf9eea22359280
author James Dong <jdong@google.com> 1315608639 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1315608639 -0700

Merge "Fix another hardcoded frame rate in the media framework test"