Bart Sears 247820c0a7 am 8e42d39f: Merge "partial inval" into honeycomb-mr1 ...

* commit '8e42d39f0b1c2a60ab9c2f88cd3835ef8ae690ed':
  partial inval

2011-03-16 21:50:52 -07:00

..

config

…

java

am 8e42d39f: Merge "partial inval" into honeycomb-mr1

2011-03-16 21:50:52 -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 20ccaf6c: Import revised translations. DO NOT MERGE

2011-03-16 17:10:09 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

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