| commit | b1755b37fc3463e2a73852cd72883c56861f2597 | [log] [tgz] |
|---|---|---|
| author | Maggie Benthall <mbenthall@google.com> | Tue Aug 27 17:03:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 27 17:03:31 2013 -0700 |
| tree | 9743170485451a44acf28ff1ad648babebbd685d | |
| parent | 90f5d21d40cec38762527583df84f0dfadd1dc5c [diff] | |
| parent | 9506d857cbc87a3dcedc8c3599f1d45ac6fe995e [diff] |
am 9506d857: Merge "Fix NPE in SecuritySettings.onResume()" into klp-dev * commit '9506d857cbc87a3dcedc8c3599f1d45ac6fe995e': Fix NPE in SecuritySettings.onResume()