Michael Wright 8f072af76d Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02 ...

am: 49f1db32ef

Change-Id: If9510872fe549d06a4f2cdef6c96862f5dfd4127

2017-04-13 07:06:11 +00:00

..

java

Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev am: 07d60cce02

2017-04-13 07:06:11 +00:00

jni

Merge "Add new "work queue" feature to JobScheduler." into oc-dev am: 0a0a63c8b1

2017-04-12 18:14:58 +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 am: 0964a2d9fc

2017-04-13 03:57:09 +00:00

tests

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

2017-04-13 05:54:27 +00:00