Dan Morrill 61f1cbdd71 am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread ...

Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp

* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
  Adding a feature definition corresponding to support for Near-Field

2010-09-01 15:05:34 -07:00

..

config

…

java

am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread

2010-09-01 15:05:34 -07:00

jni

am 63070856: Merge "Don\'t propagate StrictMode over one-way Binder calls." into gingerbread

2010-08-31 15:02:21 -07:00

res

am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread

2010-09-01 11:48:19 -07:00

tests

am 2e86809b: Merge "Native libraries on SD" into gingerbread

2010-08-30 15:21:17 -07:00