am f3cf7229: am 5e193896: Merge "Do not set type label if "Custom"." into mnc-dev

* commit 'f3cf7229bb2d6904c6c50a1d6de774d1da0c452b':
  Do not set type label if "Custom".
tree: be7d16e1a1526f079e68f01651b366beb36465c2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags