commit | f0ff0aa6b727f27c381666b14036499882cd4405 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Jul 15 11:18:53 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:18:53 2010 -0700 |
tree | acf31b604a25277ce998fffab2b93b1bdf68cea4 | |
parent | 87d49d86d8c01cca86b732cbeb6864a17a999645 [diff] | |
parent | 13bea643934b65efed4d301d1e580534431b475d [diff] |
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