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

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