Kang Li 40afdf05b5 Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev ...

am: 1f477fb270

Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8

2017-04-12 18:41:21 +00:00

..

java

Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev

2017-04-12 18:36:10 +00:00

jni

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

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

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

2017-03-13 20:00:58 +09:00

res

Merge "Import translations. DO NOT MERGE" into oc-dev

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

tests

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

2017-04-12 18:41:21 +00:00