tree 72df99b888487317090db5c8a311b24124e3c044
parent 8cf4062a07754a74007eb88f37823a364d013a5b
parent 64d7220153a5c8cea82897825e689abc9271aab7
author Robert Carr <racarr@google.com> 1471046131 +0000
committer android-build-merger <android-build-merger@google.com> 1471046131 +0000

Merge "Copy exiting app token list while stepping animation." into nyc-mr1-dev
am: 64d7220153

Change-Id: I02e3fc3a6738f6b691b57fa3f2771d647e93cd7a