tree e97f8aed65cd24e53f41ff0c3e4c5791d936db32
parent 05144f1d68c5240a1fedd42ac83814f3ecf70dfd
parent c23f3863ccd5dfbba5a0339a17a21ac35d3efead
author The Android Open Source Project <initial-contribution@android.com> 1343686247 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343686247 -0700

am c23f3863: Reconcile with jb-mr1-release

* commit 'c23f3863ccd5dfbba5a0339a17a21ac35d3efead':