tree ee8f63ebf9000acbad626c8d336fc73b60a58411
parent f93992e4b0dce1755ef4d2571b0930ef3a1107f0
parent 347092135733362bd05f944d1c1b89d33eb206a6
author The Android Open Source Project <initial-contribution@android.com> 1349275001 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349275001 -0700

am 151db1a6: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '151db1a657b83ee2a8ebfcea07eddef22b6bca6d':