Dianne Hackborn 13a0271cb8 Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev

2012-05-18 19:39:09 -07:00

..

java

Merge "Add aapt support for generating proguard rules for onClick methods." into jb-dev

2012-05-18 19:39:09 -07:00

jni

Merge "drop frame in case of error in updateTexImage" into jb-dev

2012-05-18 17:09:10 -07:00

res

Merge "Sentence case is the best case. Just Once is not a special case." into jb-dev

2012-05-18 17:32:52 -07:00

tests

Merge "Change NPN to forbid empty lists of protocols." into jb-dev

2012-05-17 11:18:33 -07:00