tree d649715f7d4d36fc3fc1b7706ce4d4ca831b393b
parent 769bf5d59ef1b6a9bce9d64d9761def735d6af65
parent c6b32054c67901b0627ad99e4bd8b15c5cc2fb90
author John Wang <johnwang@google.com> 1308269668 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308269668 -0700

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

* commit 'c6b32054c67901b0627ad99e4bd8b15c5cc2fb90':
  Revert "Do not merge. Return null id for Non-phone device."