tree b3e528a245157e98ed4e641fe6b87fe0a5fb6589
parent 1740da06b6991ecc15996c86646228367ae9ee28
parent e5c095183b71758c251f7e74ae7b909f46f0dc0a
author Andrew Lee <anwlee@google.com> 1434661356 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1434661356 +0000

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".