Christopher Tate e8f2334e7e am e1f02ef0: Merge "Miscellaneous fixes for Settings" into jb-mr1-dev ...

* commit 'e1f02ef080e5046e03b4b3b7bb64e22e7790b707':
  Miscellaneous fixes for Settings

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

..

java

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

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

jni

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

2012-09-10 13:35:51 -07:00

res

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

2012-09-10 18:16:58 -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