Commit 2f7f0e9a authored by Brian Muramatsu's avatar Brian Muramatsu Committed by Android Git Automerger
Browse files

am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge 

* commit '5ef30799':
  Backport from HC to Fix NetworkInfoTest
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
  Farewell Magnetometer Test
parents a75b19dd 5ef30799
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment