Nick Pelly 5bc8c853f5 am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread ...

Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8'

* commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8':
  Prevent use of NFC api if device is not featurized for NFC.

2010-10-19 09:53:03 -07:00

..

config

…

java

am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread

2010-10-19 09:53:03 -07:00

jni

Merge "Extended android.os.Debug.dumpNativeHeap to include /proc/self/maps contents"

2010-10-18 13:58:25 -07:00

res

Remove public resource padding.

2010-10-19 08:16:49 -07:00

tests

am 9bb8e5cc: am 8f666c2d: Merge "Test that we don\'t leak sensitive information when logging cookies." into gingerbread

2010-10-16 08:58:13 -07:00