Michael Wright 49f1db32ef Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev ...

am: 07d60cce02

Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f

2017-04-13 06:55:21 +00:00

..

java

Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev

2017-04-13 06:55:21 +00:00

jni

Merge "Add new "work queue" feature to JobScheduler." into oc-dev

2017-04-12 17:55:56 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

2017-04-12 07:00:51 -07:00

res

Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev

2017-04-13 03:47:25 +00:00

tests

Merge "Move some NetworkStats tests to tests/net." am: ab3901dc8b am: 67401e25c2

2017-04-13 05:48:37 +00:00