Romain Guy 299ae2f422 Merge "Fix javadoc typos" into oc-dev ...

am: 4b6e82d237

Change-Id: I03e9608a10deb04d3821bf411c033300bb6272ee

2017-04-14 05:20:55 +00:00

..

java

Merge "Fix javadoc typos" into oc-dev

2017-04-14 05:20:55 +00:00

jni

Merge "Add Java API for libvintf." into oc-dev

2017-04-14 02:02:08 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp

2017-04-14 04:34:25 +00:00

tests

Merge "Add Java API for libvintf." into oc-dev

2017-04-14 04:13:04 +00:00