Nick Pelly 63b7360e9d Merge "Fix NPE on devices that don't have NFC." into ics-mr1

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

..

java

Merge "Fix NPE on devices that don't have NFC." into ics-mr1

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

jni

Eliminate hw.keyboards system properties.

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

res

Merge "Unhide social stream permissions." into ics-mr1

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

tests

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

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