| commit | 015fdae70f0ac3efbb28d942e3a0b1f4ab53a112 | [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 | 802acc42d7113d4fd8add6700393058549213505 | |
| parent | 815fe39328031afcf6f9fb9b4fb659a57dd704b1 [diff] | |
| parent | f0ff0aa6b727f27c381666b14036499882cd4405 [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