Brad Ebinger 9f1ccbf5f9 Merge "Turn off Dynamic IMS switching for now" ...

am: 2bb0d95e91

Change-Id: Ie74b53ca5f0b6463b371368608c793d402878d50

2017-02-01 19:44:55 +00:00

..

java

Merge "Adds @hide permission granting API for ImsServices"

2017-02-01 19:30:41 +00:00

jni

Fix a use-of-uninitialized-value warning

2017-01-31 16:23:25 -08:00

res

Merge "Turn off Dynamic IMS switching for now"

2017-02-01 19:44:55 +00:00

tests

Fix flaky IpPrefixTest.

2017-01-26 18:52:51 +09:00