tree 0075f96baa25ccc2c8fec3b73353920ad0aca4e9
parent 861213a904da877a613ea5896f2d5712a8d8a719
parent a72a9116ae170239c5cc34dc1f46a4a165c1974b
author Nancy Chen <nancychen@google.com> 1408553686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408553686 +0000

am d33f525a: Merge "Ensure the InCallUI does not reanimate when it already is shown." into lmp-dev

* commit 'd33f525aa93abbd9919528679a641291f3599944':
  Ensure the InCallUI does not reanimate when it already is shown.