tree 876f9d92ac2170a7f7afd9d18861762bec6fa99b
parent 63e302a8c4f17582970433b316d5fec8da26a73c
parent 9fea43e972e992964313377c3392d6c0fd762a44
author The Android Open Source Project <initial-contribution@android.com> 1348679274 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348679274 -0700

am 9fea43e9: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '9fea43e972e992964313377c3392d6c0fd762a44':