Julia Reynolds f6ca4cfcd2 Merge "Also use the notification's sound for the misc channel" into oc-dev ...

am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8

2017-04-17 16:33:11 +00:00

..

java

Merge "Also use the notification's sound for the misc channel" into oc-dev

2017-04-17 16:33:11 +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

…

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