tree 65fb21b6fd42cf939cd9ea0b77251ca136297d2c
parent 55596f859acd376a3a0697f7a1f1c48330957246
parent 6aee4761a826c3ef2793dc5c62d2451bd7450c61
author Tingting Wang <tingtingw@google.com> 1437158741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437158741 +0000

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

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