commit | 892681e56ee6da6e8d4fb9ec41e75e814ae9e099 | [log] [tgz] |
---|---|---|
author | James Dong <jdong@google.com> | Thu Jul 15 11:54:10 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jul 15 11:54:10 2010 -0700 |
tree | ba88dfd4766ae1063d814797c7d691427651a1e3 | |
parent | dcd077179c853e54498e9127526a8f2984c0dda0 [diff] | |
parent | b068b47c6d0214256116a0c661740bddf7acc18c [diff] |
am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c' * commit 'b068b47c6d0214256116a0c661740bddf7acc18c': Support user-supplied timescales for authoring