tree 36998839feab7a084dcfe89ec5fcc6be70fab910
parent c38a54b1f076b86453041755e15504fd0b4d48af
parent 48d6a96b2bbd0ec4c4850dd488c6cba3c0b6371f
author Wale Ogunwale <ogunwale@google.com> 1428072765 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428072765 +0000

am 48d6a96b: (-s ours) am fce4220b: am 5fd6b139: am 4a7967ad: am f61aee97: Merge "[DO NOT MERGE] Fixed NPE when trying to animate a window without display" into lmp-mr1-dev

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