tree 656250d7099c1e0ecc5d5e7ab56524f992313cbd
parent 3011088bf0a89a7a7826a86f59f88fa5b5c254e2
parent 797ab6072402b12721dc226a9ebde3546e7640e9
author The Android Open Source Project <initial-contribution@android.com> 1317064413 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1317064413 -0700

am 4da465a0: Reconcile with ics-factoryrom-release

* commit '4da465a056f7a7322a5a4a0f235fe20e525a6eae':
  Don't crash during full backup when CheckJNI is enabled