tree 4f62b479cba3094538fe0f17bff5b0fb99efd0dd
parent 0b1ec0165a5dc98bc82670288894af446ff5bcaa
parent 80f103ae12c4eb90fc2e06a6921dde2f092a181b
author Jeff Sharkey <jsharkey@android.com> 1382750013 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382750013 -0700

am 80f103ae: Merge "Extra to always show advanced devices." into klp-dev

* commit '80f103ae12c4eb90fc2e06a6921dde2f092a181b':
  Extra to always show advanced devices.