Brian Carlstrom 0829a09f72 am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev ...

* commit '2e96c791e24454cf55144c64fe77321a31b746fe':
  Tracking upgrade to bouncycastle 1.47

2012-09-12 17:02:47 -07:00

..

java

am 2e96c791: am 743115ff: Merge "Tracking upgrade to bouncycastle 1.47" into jb-mr1-dev

2012-09-12 17:02:47 -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 0c6f1737: am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev

2012-09-12 15:28:33 -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