Jeff Brown cdfc56a387 Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev

2012-09-13 15:34:51 -07:00

..

java

Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev

2012-09-13 15:34:51 -07:00

jni

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

2012-09-12 15:44:58 -07:00

res

Merge changes I69689a73,Iaaef6d41,I7e3cb47a,I42307f58 into jb-mr1-dev

2012-09-13 10:42:22 -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