tree 73be9629ec0c55f905225f5d187896a250c58357
parent cadaa3a9839d152cdbdb8c3d5070d315910da5dd
parent 28d92afc0a17cbf9149a0c8be9c8795d6f3306a5
author John Wang <johnwang@google.com> 1310665778 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1310665778 -0700

am 28d92afc: am 2ac78a2d: Merge "Add getImei() to Phone interface." into honeycomb-LTE

* commit '28d92afc0a17cbf9149a0c8be9c8795d6f3306a5':
  Add getImei() to Phone interface.