tree b19e65a133a1cb026e993d854f961166288aa8eb
parent 94df22ad34295c1e1198ecc53466e44471f8d4d0
parent 3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332
author The Android Open Source Project <initial-contribution@android.com> 1348170760 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348170760 -0700

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

* commit '3ccddf93ac6b55b6918f23b5b143c7b1ad0e5332':