Cedric Ho 4e41767977 resolved conflicts for merge of 0af3af03 to mnc-dev ...

Change-Id: I38f423be6dcef216cf813aa0f747be38f0ad792f

2015-04-27 13:16:18 -07:00

..

java

Merge "Wire up caller chooser targets for ChooserActivity" into mnc-dev

2015-04-27 18:03:10 +00:00

jni

Merge "Add hidden SensorManager APIs for injecting sensor data."

2015-04-25 01:40:26 +00:00

res

resolved conflicts for merge of 0af3af03 to mnc-dev

2015-04-27 13:16:18 -07:00

tests

Package and storage movement callbacks.

2015-04-23 20:32:17 -07:00