tree d3b52026ec8e295c897673dda295ccd71e3f38a0
parent 3c8e51ab8dd0b9fb58c3c64768576841dbce4c3e
parent 7d74cb6c6139d42aad65fe1466ab4c5f8e029539
author John Reck <jreck@google.com> 1418163507 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418163507 +0000

am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev

* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
  Fix issue with RNA destruction mid-animation