tree 90a95a2c823d75fb38cb6e7ccf59a7fb37c2df75
parent 28d1fceed3c9d1b023b48dd0de7b1f32e00286ce
parent 13f7fc80a376ca0498c4c6876b448bfc43eaa2d4
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.