OSDN Git Service

am 1ac4ba19: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:37:23 +0000 (15:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Aug 2012 22:37:23 +0000 (15:37 -0700)
commite7424f3805e0a03102850176c605bad39bcf76e2
treeaae9457b78956abe40fc8ecacee8c3f6ea953098
parent1fd6e22b6a6c02f1c7a649a2c9caf419cf47e120
parent1ac4ba19778d3aafc84ad240e38657807e2a7aad
am 1ac4ba19: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1ac4ba19778d3aafc84ad240e38657807e2a7aad':
  Fix NPE.
  Make animators more robust against ending mid-stream