Adrian Roos 0ded7c8578 Merge "AOD: Implement redacted notificatinos" into oc-dev ...

am: 89e8b7b58e

Change-Id: I92526d3c656647fa42c0a6266d4d33f035e54c9f

2017-04-18 00:50:02 +00:00

..

java

Merge "AOD: Implement redacted notificatinos" into oc-dev

2017-04-18 00:50:02 +00:00

jni

Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev

2017-04-17 21:52:26 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

2017-04-12 07:00:51 -07:00

res

Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev

2017-04-17 21:12:59 +00:00

tests

Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev

2017-04-17 21:12:59 +00:00