tree 1c2f422290bfac3762ea20bd9471416ac11350f9
parent 9240137679e039dd1cd8a09421dfd48e44c411cb
parent 1c251f9d9a514d2233361b88ecc657c4de9b5eca
author John Wang <johnwang@google.com> 1308268038 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1308268038 -0700

Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2