| commit | cb864c5501eca57b04fd108ff98201216f22904f | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Fri Dec 13 02:20:30 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 13 02:20:30 2013 +0000 |
| tree | bbc2661369c80e9bed55216b61c9f75584f5ec3c | |
| parent | 71ed917abc2dbe18e0460f3782c3e6fe4b2a3c4f [diff] | |
| parent | fb29ca21002c99986899705fad439037d7b91f56 [diff] |
am fb29ca21: am 776e81be: am 7b470340: am 83994ad6: Merge "Fix the security related API change for PreferenceActivity" * commit 'fb29ca21002c99986899705fad439037d7b91f56': Fix the security related API change for PreferenceActivity