tree 33d8bee1a76c70280f53cabf06b2f935cb64140d
parent 46b600df71ad3a27139b3593557af9b8c1aafbbf
parent 7d0972efde0db9152b4a7078e986ae6019498130
author Scott Main <smain@google.com> 1307034113 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307034113 -0700

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

* commit 'a86290891a661ecdc8115fd441b44dcebedb9e3d':
  cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info