tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent 6012b9321fa00e7b31d876b766320e832559e0b0
parent 796d1a6b2f75bf9af3fd7b39429521f3dfb7014b
author Elliott Hughes <enh@google.com> 1276546701 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276546701 -0700

am bea3f6b6: Make System.setSecurityManager throw in the actual gingerbread.

Merge commit 'bea3f6b6201e37f1acd31eb2a8f9aeebf40b3302' into gingerbread-plus-aosp

* commit 'bea3f6b6201e37f1acd31eb2a8f9aeebf40b3302':
  Make System.setSecurityManager throw in the actual gingerbread.