Adam Powell d1f4207ba5 Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28 ...

Change-Id: Icfcd8c2aadd0fb9e49296b8318858317407e1b7f

2011-05-03 17:30:48 -07:00

..

java

Fix bug 4355335 - android.app.cts.DialogTest.testContextMenu failing on IRJ28

2011-05-03 17:30:48 -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