Merge "Add number type label to favorites list" into klp-dev
tree: 6e4d58c1cb01014a0da97e84820d7f070f20bb03
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags