tree c2175942e3a631ad112fe6ab17da560c45fc1ae2
parent 5a91c5a54edb7a2b5173548d76c12e14412f2347
parent 4368175d4ee8c36c37bcb8c2568b82e759524261
author Yorke Lee <yorkelee@google.com> 1400026048 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400026048 +0000

am 4368175d: (-s ours) am 7b61672a: am 3b76216f: (-s ours) am adee51c0: (-s ours) am 1cd781d5: am a1d699ba: Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into klp-dev

* commit '4368175d4ee8c36c37bcb8c2568b82e759524261':