Andrii Kulian 8623f89c32 Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f ...

am: de938b99fc

Change-Id: I5420f04c0d3f910ad1db3e0e5266e26de0c6f3f7

2017-04-04 02:00:22 +00:00

..

java

Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f

2017-04-04 02:00:22 +00:00

jni

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

2017-04-03 17:34:03 +00:00

proto/android

…

res

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

2017-04-04 00:05:08 +00:00

tests

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

2017-04-03 20:01:58 +00:00