Dianne Hackborn cf44040d93 resolved conflicts for merge of d3cd2596 to master ...

Change-Id: I61a37a3be8b8115b225da272903ca917c33ae4a6

2010-08-24 17:47:42 -07:00

..

config

…

java

resolved conflicts for merge of d3cd2596 to master

2010-08-24 17:47:42 -07:00

jni

Merge "Use only one GL context per process, share chaches."

2010-08-24 17:20:20 -07:00

res

Add the action bar to Theme.Light.Holo

2010-08-24 17:35:26 -07:00

tests

Merge "Allow reliable detection of a message that is in use."

2010-08-24 14:33:29 -07:00