tree d26f04b216405d2e60dc69378c08f3397cd7f555
parent 332e2a74624e3f6b89537714d6d268a9d9d9e442
parent a5e1c5f656bfad03e4411a9032536d38ac3d1078
author Chen Xu <fionaxu@google.com> 1487037437 +0000
committer android-build-merger <android-build-merger@google.com> 1487037437 +0000

Merge "add new API setActivationState to TelephonyManager" am: 5344c2f944 am: 36a7dc6fff am: 984bb68a65
am: a5e1c5f656

Change-Id: I1cf8e7beb70647391dafce45a6406577462f345d