tree f487efbd009fcc1788cadd2b02d968ff0f2ede20
parent 0882a90e1a357dc6882075b6b6e7c0b14de90645
parent df18118529eecf7f9bd821552015fea5182c8840
author Amith Yamasani <yamasani@google.com> 1366913884 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366913884 -0700

am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no visual representation for it yet." into jb-mr2-dev

* commit 'df18118529eecf7f9bd821552015fea5182c8840':
  Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.