Commits
James Dong authored and Android Git Automerger committed 892681e56eeM
am b068b47c: am d6a85a21: Merge "Support user-supplied timescales for authoring" into gingerbread Merge commit 'b068b47c6d0214256116a0c661740bddf7acc18c' * commit 'b068b47c6d0214256116a0c661740bddf7acc18c': Support user-supplied timescales for authoring
Showing diff tob068b47c6d0