| commit | 082d4087356d22209dfcccd63e4a10fdcb944d0a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 14 14:48:21 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 14 14:48:21 2010 -0700 |
| tree | 6710c176dbfa532271b972b5311159d2fc5f1283 | |
| parent | c1e335fba37a99f356c026bea2f25b24ce8edc11 [diff] | |
| parent | 6af334c00dd265e6b358092f0299cdbc3f11751f [diff] |
am 3c998caa: resolved conflicts for merge of 637d3aef to master Merge commit '3c998caacc0ded3b97e0c53b039a30cde2b27389' into dalvik-dev * commit '3c998caacc0ded3b97e0c53b039a30cde2b27389': Make System.setSecurityManager throw in the actual gingerbread.