Nick Pelly 480f50f483 am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1 ...

* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
  Fix NPE on devices that don't have NFC.

2011-11-17 12:50:39 -08:00

..

java

am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1

2011-11-17 12:50:39 -08:00

jni

am 3e7497b4: Merge "Eliminate hw.keyboards system properties." into ics-mr1

2011-11-15 19:19:04 -08:00

res

am 9be49620: Merge "Unhide social stream permissions." into ics-mr1

2011-11-17 12:28:11 -08:00

tests

am 047c4de2: Merge "Adding mobile microbenchmark tests." into ics-mr0

2011-11-15 11:10:44 -08:00