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