tree a19178e561ec2a6caaf638a0a566e1b9984c7555
parent da18591c23f6773f9822b7ea1a880501c0bdc3c8
parent 4a29cc235b83509a37ac667d9c7db73b210d1f44
author Pankaj Kanwar <pkanwar@google.com> 1493329317 +0000
committer android-build-merger <android-build-merger@google.com> 1493329317 +0000

Merge "RIL changes to allow the modem to query the framework for the key." am: 9af336425e am: 88c489b6bd am: a6dabb56a6
am: 4a29cc235b  -s ours

Change-Id: Id0b54949619530b32d08ee1c8bbfec9dcb21c5c1