Dianne Hackborn cc88ddd7ea Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d3f ...

am: 666fe849e3

Change-Id: I61afc96a01bc8bc5d637d65a3f9a84452babd3ed

2017-03-31 23:44:42 +00:00

..

java

Merge "Implement issue #36590595: Add ability to associated a ClipData with JobInfo" into oc-dev am: 2d161b1d3f

2017-03-31 23:44:42 +00:00

jni

Merge "Add opaque vendorExension fields to ProgramInfo and Properties structs."

2017-03-31 15:32:54 +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-03-31 23:04:22 +00:00

tests

Fix testFadeInInterrupt

2017-03-30 18:04:32 +09:00