tree 9dd9a7212578ef69ce5be9e2e344192d98bf48b9
parent 729c92f92f02ad1b9a9753d57ebfadc146ec80df
parent d2325c44eebdca28730922bf401ae9be53dce23a
author The Android Open Source Project <initial-contribution@android.com> 1332343650 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332343650 -0700

am d2325c44: (-s ours) am 0305b306: Reconcile with ics-mr1-release

* commit 'd2325c44eebdca28730922bf401ae9be53dce23a':
  stingray: Kernel prebuilt -- DO NOT MERGE