commit | 7cfaa8ceb2ed2c8bc6318d2499e7033060cc3123 | [log] [tgz] |
---|---|---|
author | Doris Ling <dling@google.com> | Sun Apr 16 00:58:43 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sun Apr 16 00:58:43 2017 +0000 |
tree | c3878314d2e37a518ef92ac589ac2ae457e3b309 | |
parent | a2f8f3a01a78a536f020f96e55592d42f79b84d7 [diff] | |
parent | 8b182839a51e75e7b69f9c89d0ca2e8a33fa7028 [diff] |
Merge "Update subtext for Security settings." into oc-dev am: a0e617f96d am: 8b182839a5 Change-Id: Ia3d158eb681c12c7c6cf21eb475835d36664afee