Merge "Do not set type label if "Custom"." into mnc-dev
tree: 5d03d6385d1411b56b03387c0f71e982c69aa2c8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags