Steven Moreland 8bb391016b Merge "Cleanup hwbinder getService code." am: 9be24a3040 am: 4ede371d80 ...

am: ec840d1464

Change-Id: I83a7077f07689dc57ac4d8828508443cc4385292

2017-02-01 21:03:54 +00:00

..

java

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

2017-02-01 19:42:16 +00:00

jni

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

2017-02-01 21:03:54 +00:00

res

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

2017-02-01 19:53:27 +00:00

tests

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

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