tree 5bf8fdfa919cb0778048467e47ff2d061a6ccf23
parent b220533ad1cfccb08e01df2df5b72ab41a3af6b7
parent 0305b3069f74784196bd0154c3d9ad7a6844c150
author The Android Open Source Project <initial-contribution@android.com> 1332343506 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1332343506 -0700

am 0305b306: Reconcile with ics-mr1-release

* commit '0305b3069f74784196bd0154c3d9ad7a6844c150':
  stingray: Kernel prebuilt -- DO NOT MERGE