Jeff Sharkey 2d4630c809 Merge "Hide NetworkTemplate details, buffered stats I/O."

2011-07-14 21:15:49 -07:00

..

java

Merge "Hide NetworkTemplate details, buffered stats I/O."

2011-07-14 21:15:49 -07:00

jni

Force bitmaps to load in ARGB8888 by default.

2011-07-14 12:42:19 -07:00

res

Merge "Smooth the spinners"

2011-07-14 18:58:28 -07:00

tests

resolved conflicts for merge of ab3ec176 to honeycomb-plus-aosp

2011-07-13 12:29:57 -07:00