diff options
author | Maggie Benthall <mbenthall@google.com> | 2013-08-28 00:00:00 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-08-28 00:00:01 +0000 |
commit | 9506d857cbc87a3dcedc8c3599f1d45ac6fe995e (patch) | |
tree | 975244d7ef83838be0ce9c72b9160aa67fd7c5af /src/com/android/settings/nfc | |
parent | cb6ba728c5f872bc66e3b8ac3682b350cb7501f0 (diff) | |
parent | f48206e37e8a88a2f5f9b019995488696f8bf964 (diff) | |
download | packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.zip packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.tar.gz packages_apps_Settings-9506d857cbc87a3dcedc8c3599f1d45ac6fe995e.tar.bz2 |
Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev
Diffstat (limited to 'src/com/android/settings/nfc')
0 files changed, 0 insertions, 0 deletions