Hall Liu 9c92cd2e87 Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b ...

am: 8fd59b38b7

Change-Id: I1217efc28d9d9c825dd9bf361d7f2f35510b4b27

2017-11-14 10:17:36 +00:00

..

android/telephony

Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b

2017-11-14 10:17:36 +00:00

com/android

Merge "Remove the OEM hook implementation and usage" am: 413a308126

2017-11-10 00:53:54 +00:00