Merge "Fixes NPE and adds @Nullable to PackageSetting.pkg" into rvc-dev am: 697c8e9546 am: 8558aeb6f8
Change-Id: I47d092cce1db67b67befdd3567bb4f7d871e340f
This commit is contained in:
697c8e9546 am: 8558aeb6f8
Change-Id: I47d092cce1db67b67befdd3567bb4f7d871e340f