tree b2a556e25f3c8f2e36d5a409ea617d977cccc885
parent 16fe8205d5bf5ac035f44107814d32d010e25a79
parent 0505d35c3f8cd58bd9203174831718b4ef7869f4
author Conley Owens <cco3@android.com> 1350511758 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350511758 -0700

am 0505d35c: Merge "Filter out more devices."

* commit '0505d35c3f8cd58bd9203174831718b4ef7869f4':