diff options
author | James Dong <jdong@google.com> | 2010-07-15 11:18:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-15 11:18:53 -0700 |
commit | b068b47c6d0214256116a0c661740bddf7acc18c (patch) | |
tree | 9a623f59c4c8d43db94da78137378b858f591b9d /graphics/tests | |
parent | 92a47ea3a7b82708e46c9d1710355f5e5fdd4f07 (diff) | |
parent | d6a85a21418338a7797bff731fa7a551f62a9e86 (diff) | |
download | frameworks_base-b068b47c6d0214256116a0c661740bddf7acc18c.zip frameworks_base-b068b47c6d0214256116a0c661740bddf7acc18c.tar.gz frameworks_base-b068b47c6d0214256116a0c661740bddf7acc18c.tar.bz2 |
am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp
* commit 'd6a85a21418338a7797bff731fa7a551f62a9e86':
Support user-supplied timescales for authoring
Diffstat (limited to 'graphics/tests')
0 files changed, 0 insertions, 0 deletions