tree 8067cb3e804339e5cb879e880284817a449f831d
parent 64be241698589aa618fa73aec65184cb1893f4ef
parent 1cd781d5fec52e7d68d4391ac4282b5b06a00393
author Yorke Lee <yorkelee@google.com> 1394153212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394153212 +0000

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

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