tree 025e1248ffedb5243226d4c2fee22b92bc4dc633
parent 6896e4a09f36174142c09fc026a1ae5affba77ac
parent 6c9d43bb809b88f7209c8e47f840be8accf35c45
author Yorke Lee <yorkelee@google.com> 1394161795 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394161795 +0000

am 6c9d43bb: (-s ours) am 97a9341e: 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 '6c9d43bb809b88f7209c8e47f840be8accf35c45':
  Fix jank in no favorites screen when showing/hiding dialpad DO NOT MERGE