Jim Miller 70f4d96fe1 am 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev ...

* commit '4f77268c8a75dd89303b0c6bcf6ee02a97a68d1a':
  Initial pass at adding Music control to new keyguard.

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

..

java

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

2012-09-12 16:14:01 -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 4f77268c: Merge "Initial pass at adding Music control to new keyguard." into jb-mr1-dev

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