Eric Fischer 0f3340cf99 Merge "Import revised translations."

2011-03-17 17:32:50 -07:00

..

config

…

java

Merge "Add support for timestamps into SurfaceTexture."

2011-03-17 15:52:34 -07:00

jni

Add support for timestamps into SurfaceTexture.

2011-03-17 13:10:03 -07:00

res

Import revised translations.

2011-03-17 16:51:07 -07:00

tests

am 05ab5caa: am cf994cc5: Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1

2011-03-10 16:01:45 -08:00