Raph Levien 7927fe5963 am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev ...

* commit 'eb1f5349f8ac51e12e48497bbd2ae37badfe5009':
  Fix for b7155617 race condition in TextLayoutCache.cpp

2012-09-12 15:47:16 -07:00

..

java

am f4fd2eb5: Merge "Minor update to addjavascriptinterface documentation" into jb-mr1-dev

2012-09-12 13:42:59 -07:00

jni

am eb1f5349: Merge "Fix for b7155617 race condition in TextLayoutCache.cpp" into jb-mr1-dev

2012-09-12 15:47:16 -07:00

res

am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev

2012-09-11 14:02:05 -07:00

tests

Merge "Update airplane-mode manipulation for the new Settings namespace" into jb-mr1-dev

2012-09-10 17:16:17 -07:00