tree 0b6a908720b86b4786dfca3a4930817184e2f523
parent 427622e1c0981ac63c95384b058ece10632debd1
parent 3b40bbea9b46c445d943e1e9dd1d3a87b41f78b8
author Grace Chen <chengrace@google.com> 1494964260 +0000
committer android-build-merger <android-build-merger@google.com> 1494964260 +0000

Merge "Support different SIM power states" am: a908a78861
am: 3b40bbea9b

Change-Id: I78a230bea7c495b8b09e42ce2b9d14f0f3328ac7