Vladislav Kaznacheev 2679fe4e95 Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev ...

am: 0964a2d9fc

Change-Id: I800980c3c887dd722410b427b7912b254012effc

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

..

java

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

2017-04-13 03:47:25 +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 "Revert "Make selection end handle stick to selection at line end."" into oc-dev

2017-04-12 23:37:03 +00:00