Daniel Sandler 90497c18f7 Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev

2012-05-21 12:12:13 -07:00

..

java

Merge "Remotable view method for TextView.setTextSize(int, float)." into jb-dev

2012-05-21 12:12:13 -07:00

jni

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

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

res

Support more items in the Notification.InboxStyle, plus an overflow.

2012-05-21 07:56:58 -07:00

tests

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

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