OSDN Git Service

Merge "Radio Interface changes to pass the encryption object, including the key,to...
authorPankaj Kanwar <pkanwar@google.com>
Tue, 13 Jun 2017 22:13:57 +0000 (22:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 22:13:57 +0000 (22:13 +0000)
am: f13b8a78f6  -s ours

Change-Id: I4e426aaf8a9aead120a77722659f5aef7fa110d8


Trivial merge