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

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

2011-06-16 16:50:05 -07:00

..

java

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

2011-06-16 16:50:05 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

tests

Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.

2011-03-14 12:39:01 -07:00