OSDN Git Service

Merge "Add secure settings to the test apps" am: 1170b46a74
authorNataniel Borges <natanieljr@google.com>
Thu, 26 Sep 2019 12:25:45 +0000 (05:25 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Sep 2019 12:25:45 +0000 (05:25 -0700)
am: a9c2747b31

Change-Id: I7dac81f71b873d77e4f11acbf727b149f9217fd5


Trivial merge