tree f5f158caa46550c9144606d3c5d90bd7b6868528
parent ccd1c21f4491422cedd9ac122d964aa50c5c8fcf
parent d9b11c3a7bdffa02bf7e2bd84f291c9c7418c884
author The Android Open Source Project <initial-contribution@android.com> 1352233875 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233875 -0800

am d9b11c3a: (-s ours) am cc86adcb: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'd9b11c3a7bdffa02bf7e2bd84f291c9c7418c884':