am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
tree: 713706e3b687bb494c536ef68d1314634302de9f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE