OSDN Git Service

Merge "Support different SIM power states" am: f94eb06d32 am: b6e91f51f6 am: 22facb038d
authorGrace Chen <chengrace@google.com>
Tue, 16 May 2017 20:08:27 +0000 (20:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 20:08:27 +0000 (20:08 +0000)
am: a442f2873f  -s ours

Change-Id: I34bb5526fc8800431e1562c12f0a444163475349


Trivial merge