tree 0b66c9a2749aeaa67eb630f4528172313f256b28
parent 4cdfb578e5032b37fe61e4580a55f6f39e369e87
parent 76572c63b8615b55a7883dcf40024653436be4c9
author The Android Open Source Project <initial-contribution@android.com> 1352233469 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233469 -0800

am 76572c63: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '76572c63b8615b55a7883dcf40024653436be4c9':