tree 8067cb3e804339e5cb879e880284817a449f831d
parent 369e965c942851cc4eda64d5a550e0da542f7c84
parent b21d78f577fffb717c3b52a83e0e54e3f4867567
author Yorke Lee <yorkelee@google.com> 1394153425 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394153425 +0000

am b21d78f5: am 1cd781d5: (-s ours) am a1d699ba: Merge "Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE" into klp-dev

* commit 'b21d78f577fffb717c3b52a83e0e54e3f4867567':
  Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE