tree f03503c967b8db75837f9840c6d72416dcb09cc8
parent ec73ac81e538c2844f32d35dd9c8e30b544efdcb
parent fec4f3e4ab0321ac5f2d133ae293f882a8567269
author Yorke Lee <yorkelee@google.com> 1386283505 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1386283505 +0000

am fec4f3e4: (-s ours) am 62e57481: am ea695cb0: Handle dialpad animations better

* commit 'fec4f3e4ab0321ac5f2d133ae293f882a8567269':