Daniel Cardenas a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52 ...

am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8

2017-04-04 01:47:15 +00:00

..

java

Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52

2017-04-04 01:47:15 +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