tree 8f8436ad41e27dd5f2c15b1e0ef0069daf0a42a1
parent 8499c25dbc98bffecbbafb56bd86fd2b70a44120
parent 03fb807d3a842302a99a55a65b6cb1216bfb3b6e
author Chen Xu <fionaxu@google.com> 1523515130 -0700
committer android-build-merger <android-build-merger@google.com> 1523515130 -0700

Merge "Change getGroupIdLevel1() to use subId from TelephonyManager Instance" am: 18fe1cb2e1 am: a8df607460
am: 03fb807d3a

Change-Id: I4f00f17234951111b5031538522315ab02891e0f