Jim Miller 4f77268c8a Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev

2012-09-12 16:16:21 -07:00

..

java

Merge "A new broadcast action which is sent when profile changes" into jb-mr1-dev

2012-09-12 16:11:13 -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

Initial pass at adding Music control to new keyguard.

2012-09-11 16:21:29 -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