tree 8456c0fd83c40ed6c18737b1cf7a9e759df66b33
parent fc5430a39ca0773e959139b774c9f7e91ab2edd5
parent c66327149a8b6666fdfee02a2f0feb48ef7086e3
author Thecrazyskull <anaskarbila@gmail.com> 1485710533 +0000
committer android-build-merger <android-build-merger@google.com> 1485710533 +0000

Merge "KeySetManagerService: prevent NPE"
am: c66327149a

Change-Id: I09d6fb3e2644ab9330b10bd67c44e61a204e589b