tree efd4d1bad284b1432f9cf7aea7b319c50e65c797
parent fc109ad55ee6d6e598c1ee2dfd5d8525bb12775d
parent 59c37194bb8112f50ce4fca147e160c6c6ec387c
author Christopher Tate <ctate@google.com> 1320361483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320361483 +0000

am 4fdad1af: Merge "Add persistent property to disable strict mode" into ics-mr1

* commit '4fdad1af53ea46892f477185ff93d4182b7aadf9':
  Add persistent property to disable strict mode