Michael Kolb 9a0df3c5c7 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 ...

* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight

2011-03-16 11:35:45 -07:00

..

config

…

java

am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1

2011-03-16 11:35:45 -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