Nick Pelly 54770496d3 am 6b09a90a: am e47150e9: Fix up NFC permissions. ...

Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e'

* commit '6b09a90a818137de52a0c7325339849ccf584b9e':
  Fix up NFC permissions.

2010-10-18 16:42:18 -07:00

..

config

…

java

am 6b09a90a: am e47150e9: Fix up NFC permissions.

2010-10-18 16:42:18 -07:00

jni

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

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

res

am 6b09a90a: am e47150e9: Fix up NFC permissions.

2010-10-18 16:42:18 -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