Adam Cohen 3f3a60a037 am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev ...

* commit '2664f94f209100abacbfc857c33eac784f0fd6cf':
  Adding notion of keyguard widgets

2012-09-12 15:14:57 -07:00

..

java

am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev

2012-09-12 15:14:57 -07:00

jni

am 9725ff46: am 6fc7275d: Merge "Camera: Add enableShutterSound method." into jb-mr1-dev

2012-09-12 15:13:46 -07:00

res

am 2664f94f: am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev

2012-09-12 15:14:57 -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