Chad Brubaker fb095d897f Merge "Expose animator settings to Instant Apps" into oc-dev ...

am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b

2017-04-04 00:31:01 +00:00

..

java

Merge "Expose animator settings to Instant Apps" into oc-dev

2017-04-04 00:31:01 +00:00

jni

Merge "Camera: add batching support to HAL1 recording path" into oc-dev

2017-04-03 17:24:40 +00:00

proto/android

CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED

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

res

Merge "Expose framework activities to Instant Apps" into oc-dev

2017-04-03 23:58:25 +00:00

tests

Merge "Revert "Push chooser targets to the shortcut manager."" into oc-dev

2017-04-03 19:54:24 +00:00