Jeff Brown 08965fc730 resolved conflicts for merge of 4e14159a to master ...

Change-Id: I42dc1efc2218af326a826aeb16daded71722b363

2010-08-11 18:00:34 -07:00

..

config

…

java

resolved conflicts for merge of 4e14159a to master

2010-08-11 18:00:34 -07:00

jni

am 679ac09a: am a5ae50cd: Merge "More native work." into gingerbread

2010-08-11 00:50:56 -07:00

res

ActionBar overlay mode, height fetching, show/hide

2010-08-11 16:17:57 -07:00

tests

am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations

2010-08-10 12:04:04 -07:00