tree bf6866705d005ce3cde8128b9ca6f68aa8c906ef
parent cdd5447c1ed159afde002dc85c3542e685bdc6ba
parent 968db1dc85fcf0aec4636b5a7e8848ae27462ef9
author The Android Open Source Project <initial-contribution@android.com> 1345904323 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345904323 -0700

am 968db1dc: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '968db1dc85fcf0aec4636b5a7e8848ae27462ef9':