Svetoslav Ganov e5f823ccf1 am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1 ...

* commit '5a2c6fbf847af971457f014ce7073812c9dd31e7':
  NPE in in AppGlobals#getIntCoreSetting

2011-03-03 18:22:29 -08:00

..

config

…

java

am 5a2c6fbf: am e70c6607: Merge "NPE in in AppGlobals#getIntCoreSetting" into honeycomb-mr1

2011-03-03 18:22:29 -08:00

jni

Merge "Fix a compare of JNI references to use IsSameObject."

2011-03-03 17:17:43 -08:00

res

Import revised translations. DO NOT MERGE

2011-03-03 14:05:57 -08:00

tests

do not merge: Cherry pick change I878192090 from master.

2011-03-03 13:54:38 -08:00