diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-02 03:07:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-02 03:07:52 +0000 |
| commit | 96c47d45e7723343cebfb440977fdb9820f07af5 (patch) | |
| tree | 5a607396c4fed91de27f7cebaa004b0f1bdbba03 /src/com/android/settings/SecuritySettings.java | |
| parent | 1321412c797d69a51ffe71b0a2913175cfbfcfcb (diff) | |
| parent | 9093b6eba24273e9507072ff761dbcd789e1a601 (diff) | |
| download | packages_apps_Settings-96c47d45e7723343cebfb440977fdb9820f07af5.tar.gz packages_apps_Settings-96c47d45e7723343cebfb440977fdb9820f07af5.tar.bz2 packages_apps_Settings-96c47d45e7723343cebfb440977fdb9820f07af5.zip | |
Merge changes from topic 'mwd-merge-040115'
* changes:
Merge commit '279cb4a' into merge
Merge commit '898e486' into merge
Merge commit 'fc75374' into merge
Merge commit '2241607' into merge
Merge commit 'fe47522' into merge
Diffstat (limited to 'src/com/android/settings/SecuritySettings.java')
0 files changed, 0 insertions, 0 deletions