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
tree: 025e1248ffedb5243226d4c2fee22b92bc4dc633
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags