tree 8af824e69e19527c4992b9e984359dc9ea28b748
parent d06dd400f224f966d2603a75a4431805c349c221
parent 6f277ef64ecd17bf0d5e82a1698bbfb0afb3ffd2
author Jean-Baptiste Queru <jbq@google.com> 1335806628 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335806628 -0700

am 6f277ef6: (-s ours) Merge "Clean up device list - do not merge" into jb-dev

* commit '6f277ef64ecd17bf0d5e82a1698bbfb0afb3ffd2':
  Clean up device list - do not merge