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

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