tree 2f492e261aa3c5bb806e4cc5f96d5c7c3c7b7b82
parent cfbf2261651abba5822b4a2e0213427b298fcb63
parent d1f5b4245fee14826502aa4ed00de4c69221afda
author Jack Yu <jackyu@google.com> 1487732204 +0000
committer android-build-merger <android-build-merger@google.com> 1487732204 +0000

Merge "Added telephony manager set sim power state API" am: cbffe38631
am: d1f5b4245f

Change-Id: I0db1ff82aa80b3719efa9c0bdc2ca0a6f39347a5