tree 51284820a388ffca949bf1773e9ee8229d52395e
parent 7ded3a1a7322ddb750cc690ce93b46b35d872039
parent 0fcbbddfcfe44e4ed132f7fd41186f4789de3aa0
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."