tree 39855251b927f17f4a071202263abeeee96f48bc
parent 589a272e97d1f24abee1bdfce18ab88cbd5f12a9
parent f61aee97adf4e543e82289511c6127bcfa53151c
author Wale Ogunwale <ogunwale@google.com> 1428020126 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428020126 +0000

am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

* commit 'f61aee97adf4e543e82289511c6127bcfa53151c':
  [DO NOT MERGE] Fixed NPE when trying to animate a window without display