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