Christopher Tate 79cf1a2291 Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev

2012-09-12 17:51:36 -07:00

..

java

Merge "Moved a few telephony settings from Secure to Global" into jb-mr1-dev

2012-09-12 17:51:36 -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

Music in keyguard improvements

2012-09-12 16:38:56 -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