John Wang e21217af64 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."

2011-06-16 17:14:28 -07:00

..

java

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

2011-06-16 17:14:28 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp

2011-06-07 16:32:10 -07:00