| commit | fb29ca21002c99986899705fad439037d7b91f56 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Thu Dec 12 17:54:27 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 12 17:54:27 2013 -0800 |
| tree | bbc2661369c80e9bed55216b61c9f75584f5ec3c | |
| parent | 817bed5440034ab943a0789dd3f54e5eaf87bcab [diff] | |
| parent | 776e81be3701c724b2ecbe90749e0d090aac941b [diff] |
am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity" * commit '776e81be3701c724b2ecbe90749e0d090aac941b': Fix the security related API change for PreferenceActivity