Mike Lockwood 395765a9cb Merge "UsbManager: document that passing null setCurrentFunction restores default function"

2011-07-18 15:59:35 -07:00

..

java

Merge "UsbManager: document that passing null setCurrentFunction restores default function"

2011-07-18 15:59:35 -07:00

jni

Add lock/unlockCanvas to TextureView

2011-07-18 15:02:06 -07:00

res

Merge "Derive GridLayout's 'gap' constants from new "default_gap" entry in dimens.xml."

2011-07-18 15:17:06 -07:00

tests

Merge "Track line and column when parsing JSON."

2011-07-18 14:39:39 -07:00