Michael Kolb b0a07f0ce5 am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 ...

* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag

2011-03-16 13:34:30 -07:00

..

config

…

java

am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1

2011-03-16 13:34:30 -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 cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1

2011-03-16 10:51:56 -07:00

tests

resolved conflicts for merge of 16cbe575 to honeycomb-mr1

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