tree e6d8cbca1edff3dd8e3f2e6a775dd96fa035646e
parent b82367512177999e240bb35ededcae20dd1e14ee
parent 99960b73e986409f61c5b5d05aa04dea3105a663
author Scott Main <smain@google.com> 1307033529 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1307033529 -0700

Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2