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