am 118b5b03: am 7b3b10b6: Merge "Clean up todos in Dialer" into klp-dev

* commit '118b5b03a9fa3d72a09945534b32a68f8e1e2394':
tree: 701114b5c0756dc29829857bdb8d6e8048c01ac0
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags