Nick Pelly 5394ef0618 am 630ac8df: Merge "NFC documentation overhaul." into gingerbread ...

* commit '630ac8df2478cd0d47a90b95fbb13b9de4ad58b1':
  NFC documentation overhaul.

2011-02-03 15:55:53 -08:00

..

config

…

java

am 630ac8df: Merge "NFC documentation overhaul." into gingerbread

2011-02-03 15:55:53 -08:00

jni

am 61d9ffbf: Merge "Do not merge." into gingerbread

2011-01-13 12:06:38 -08:00

res

resolved conflicts for merge of 0a4b3fd9 to gingerbread-plus-aosp

2011-02-02 14:23:10 -08:00

tests

am 7a7ed2b2: Merge "Do not check features in PackageManagerService DO NOT MERGE" into gingerbread

2011-01-31 17:55:11 -08:00