Adam Cohen 172cb76964 Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev

2012-09-21 17:11:38 -07:00

..

java

Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev

2012-09-21 17:11:38 -07:00

jni

Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev

2012-09-21 16:05:59 -07:00

res

Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev

2012-09-21 17:05:47 -07:00

tests

Merge "fix broken user build: do not throw an error when in user flavor." into jb-mr1-dev

2012-09-20 15:35:00 -07:00