Romain Guy fbef58faad am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." ...

* commit '258f32e2e3ff7f4f4b1395cae292098141047fde':
  Disable plugins if setPluginsEnabled(false) called.

2011-06-06 17:54:12 -07:00

..

config

…

java

am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."

2011-06-06 17:54:12 -07:00

jni

am 0aa1017f: Prevent allocation overflows by corrupt NDEF records.

2011-06-01 09:51:15 -07:00

res

resolved conflicts for merge of ab79ee4a to gingerbread-plus-aosp

2011-06-06 15:33:37 -07:00

tests

Merge "Scolling using arrow keys with padding"

2011-04-29 10:00:26 -07:00