Yifan Hong 6955963d18 Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev ...

am: 35edfc1fdc

Change-Id: I0b604d7e6faf1b72bb7271fbb4ad7056f9d800ae

2017-04-15 10:04:52 +00:00

..

java

Merge "Remove ScoredNetwork.BADGING constants." into oc-dev

2017-04-15 09:13:41 +00:00

jni

Merge "Update for removing mount arg to VintfObject::CheckCompatibility" into oc-dev

2017-04-15 10:01:25 +00:00

proto/android

Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED

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

res

Merge "API for notification listener for Companioon apps" into oc-dev

2017-04-15 04:22:48 +00:00

tests

Merge "Remove unnecessary casts on calls to findViewById" into oc-dev

2017-04-14 17:04:19 +00:00