tree e931f06d00f8a0cca34062866f95ab089910e67e
parent 5462fc9a38fa8c9dff434cd53fa5fb1782ae3042
parent 8f5f2fcee5c12d08df71d17017410c50951fc2e3
author James Dong <jdong@google.com> 1279217768 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1279217768 -0700

Merge "Support user-supplied timescales for authoring" into gingerbread