Steven Moreland ec840d1464 Merge "Cleanup hwbinder getService code." am: 9be24a3040 ...

am: 4ede371d80

Change-Id: Ia0f3f88d8881f89cec6939dbb44d7dbbb8da9a7f

2017-02-01 20:57:59 +00:00

..

java

Merge "Adds @hide permission granting API for ImsServices" am: 390ec27f9d

2017-02-01 19:35:56 +00:00

jni

Merge "Cleanup hwbinder getService code." am: 9be24a3040

2017-02-01 20:57:59 +00:00

res

Merge "Turn off Dynamic IMS switching for now" am: 2bb0d95e91

2017-02-01 19:49:24 +00:00

tests

Merge commit '88932754ffdcbffb3cb43e03991e5eb598c10458' into nyc-mr1-dev-plus-aosp

2017-01-27 06:39:52 +00:00