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

am: cba1893400

Change-Id: I67e7438a5563192391366683695c7fc4514a5bd6

2017-04-12 18:14:58 +00:00

..

java

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

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

…

res

Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a am: 03f9a489cb am: 7c1460f388

2017-04-12 15:59:22 +00:00

tests

Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test."

2017-04-12 00:04:05 +00:00