Todd Kennedy 62fc9fd7e7 Merge "update docs per API council" into oc-dev ...

am: e28cccab24

Change-Id: I156e1547adab002afee19bacbd13808936a48775

2017-04-19 01:40:36 +00:00

..

java

Merge "update docs per API council" into oc-dev

2017-04-19 01:40:36 +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 "Minor UI adjustments to a11y button chooser" into oc-dev

2017-04-18 21:22:33 +00:00

tests

Merge "guard against nulls in LogMaker" into oc-dev

2017-04-18 23:43:50 +00:00