Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp * commit 'd6a85a21418338a7797bff731fa7a551f62a9e86': Support user-supplied timescales for authoring
Merge commit 'd6a85a21418338a7797bff731fa7a551f62a9e86' into gingerbread-plus-aosp * commit 'd6a85a21418338a7797bff731fa7a551f62a9e86': Support user-supplied timescales for authoring