tree 71b4b84cd2f899bbb7c2b9809cfcaf28abbd94d6
parent 1de4f8ed7174c7f47ea8f277cc3169a06d83c0e2
parent 0cdfa1223c7fa1532c6d0e91919ecac640fec996
author The Android Open Source Project <initial-contribution@android.com> 1345590591 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345590591 -0700

am 0cdfa122: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0cdfa1223c7fa1532c6d0e91919ecac640fec996':