tree 9a5e5aa355a2a54c73420a83c3aacc286b510916
parent aea450e82fd8c5558e9164cbeec84916401f3d1c
parent eeca586bda0411d162307e1581e9308f5173592e
author The Android Open Source Project <initial-contribution@android.com> 1345590599 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345590599 -0700

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

* commit 'eeca586bda0411d162307e1581e9308f5173592e':