Adam Powell 0d42f17f5e Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated"

2011-05-03 14:55:54 -07:00

..

java

Merge "Fix bug 4345702 - update action bar tab views when the Tab object is updated"

2011-05-03 14:55:54 -07:00

jni

Merge "Allows to render with an OpenGL context inside a TextureView."

2011-05-02 18:33:26 -07:00

res

Merge "Import revised translations."

2011-05-03 10:57:54 -07:00

tests

resolved conflicts for merge of db46fa25 to master

2011-05-02 14:41:57 -07:00