tree dba8154c1eb5513cab372e77d25178b4b737b9f9
parent 33c7520b68e015c46ed1bcb277dc4faaa368cc55
parent 3ac436b758830eb938c62d5ed91caa7808b5b63e
author Jeff Sharkey <jsharkey@android.com> 1382750272 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382750272 -0700

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

* commit '3ac436b758830eb938c62d5ed91caa7808b5b63e':
  Extra to always show advanced devices.