| commit | 7b4703402e2cc999a20fc3f40eb165a0c6cc2da9 | [log] [tgz] |
|---|---|---|
| author | Satoshi Kataoka <satok@google.com> | Tue Oct 08 22:50:13 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 08 22:50:13 2013 -0700 |
| tree | 145a626d8d6362d855292805ff92f0f167cbde12 | |
| parent | a8285a2425865ec617ae6c3d0fd22208ffc5ef17 [diff] | |
| parent | 83994ad66b337276c8ba18249a1c5d52540eeef3 [diff] |
am 83994ad6: Merge "Fix the security related API change for PreferenceActivity" * commit '83994ad66b337276c8ba18249a1c5d52540eeef3': Fix the security related API change for PreferenceActivity