Jeff Brown e63a1a05d7 am cdfc56a3: Merge "Add preliminary API for reporting display capabilities." into jb-mr1-dev ...

* commit 'cdfc56a3872f6bae7c43aedd5c718c5fa3fbdf9d':
  Add preliminary API for reporting display capabilities.

2012-09-13 15:36:19 -07:00

..

java

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

2012-09-13 15:36:19 -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 e0013828: Merge "Bring back new permission organization." into jb-mr1-dev

2012-09-13 10:43:54 -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