From: Nataniel Borges <natanieljr@google.com>
Date: Thu, 26 Sep 2019 12:25:45 +0000 (-0700)
Subject: Merge "Add secure settings to the test apps" am: 1170b46a74
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f84fab04ea54f30688418863e4dd18b6d2e91a21;p=android-x86%2Fframeworks-base.git

Merge "Add secure settings to the test apps" am: 1170b46a74
am: a9c2747b31

Change-Id: I7dac81f71b873d77e4f11acbf727b149f9217fd5
---

f84fab04ea54f30688418863e4dd18b6d2e91a21