tree eb3dd55b30c02cf1c6f08658c2899b3584042e93
parent c2410cb9e576b420d96de627f2ed1043a4d7f93f
parent 873443832051bfce7d5f5a04e883d1b65d547472
author Thecrazyskull <anaskarbila@gmail.com> 1485711323 +0000
committer android-build-merger <android-build-merger@google.com> 1485711323 +0000

Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2 am: 7adb348796
am: 8734438320

Change-Id: I8618393edf8c2c41663dfb457588ac4f9511239c