tree 3cb18ba13bc201592ab149150569b5dc8809ffd1
parent f4d5fa93bb9287a3748304436b4e57e8e8132713
parent b1322a2a11b3475f2f657674d83b98884c308c09
author Tingting Wang <tingtingw@google.com> 1437159643 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437159643 +0000

am b1322a2a: am 6aee4761: am ad359f2e: Merge "Revert "Don\'t display Custom for PHONE_TYPE=CUSTOM part 1."" into mnc-dev

* commit 'b1322a2a11b3475f2f657674d83b98884c308c09':
  Revert "Don't display Custom for PHONE_TYPE=CUSTOM part 1."