tree c4dbcd0642d2d4f49d3c7b9e8d52acb377acfd28
parent a377b026f65eb49f3724a785b52061b688905580
parent 51ad0f67d27be05d44304efe58a58590c3d11671
author Thecrazyskull <anaskarbila@gmail.com> 1485710807 +0000
committer android-build-merger <android-build-merger@google.com> 1485710807 +0000

Merge "KeySetManagerService: prevent NPE" am: c66327149a
am: 51ad0f67d2

Change-Id: I72d62e1d1f3d2b6db616762e724c1608a1e487c8