Christopher Tate 272e2a5cec am 23e03832: am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev ...

* commit '23e038323dc79c3d5355ba4b4b77060a763a1a91':
  Miscellaneous fixes for Settings

2012-09-10 19:25:29 -07:00

..

java

am 23e03832: am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev

2012-09-10 19:25:29 -07:00

jni

am 515c34f2: am cae2e388: Merge "SurfaceTexture: add updateTexImage synchronization" into jb-mr1-dev

2012-09-10 17:15:34 -07:00

res

am bd5cd21d: am eeabf942: Merge "Allow pattern to start from outside pattern view" into jb-mr1-dev

2012-09-10 18:21:08 -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