Julia Reynolds 211d99d1b9 Merge "Remove @removed method" into oc-dev ...

am: bbcf5fba1c

Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6

2017-04-17 15:09:24 +00:00

..

java

Merge "Remove @removed method" into oc-dev

2017-04-17 15:09:24 +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 "Add a default SSID prefix for local only hotspot" into oc-dev

2017-04-15 20:37:37 +00:00

tests

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

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