fionaxu 4aadda1902 Merge "remove deprecated SIM_ACTIVATION_REQUEST intent" ...

am: 7f8d27f84b

Change-Id: Ia1216368a2a2a4959283d95bbc4be26789f151f6

2017-03-17 23:34:49 +00:00

..

java

Merge "remove deprecated SIM_ACTIVATION_REQUEST intent"

2017-03-17 23:34:49 +00:00

jni

Merge "fd_utils: address a couple of TODOs."

2017-03-17 09:51:35 +00:00

res

Merge "Add a flag that indicates whether in-band ringing is avalable"

2017-03-17 00:09:58 +00:00

tests

Merge "Refactor code incompatible with Mockito 2.7.13"

2017-03-10 20:43:07 +00:00