Dianne Hackborn f3d2608939 am c9e94ea6: Merge "Fix issue #7213113: Remove old intent resolver" into jb-mr1-dev ...

* commit 'c9e94ea6451958fce107580b54c183181de6aa22':
  Fix issue #7213113: Remove old intent resolver

2012-09-21 17:50:36 -07:00

..

java

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

2012-09-21 17:50:36 -07:00

jni

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

2012-09-21 17:49:51 -07:00

res

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

2012-09-21 17:50:36 -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