Eric Fischer b05f0b84b2 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 ...

* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE

2011-03-22 13:59:20 -07:00

..

config

…

java

am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1

2011-03-22 13:56:35 -07:00

jni

am afd1c014: Merge "SqliteDatabase: Fix local reference leak in custom_function_callback()" into honeycomb-mr1

2011-03-15 13:42:35 -07:00

res

am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-22 13:59:20 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

2011-03-10 15:09:46 -08:00