tree cfb403c6ffc7cc28ded75f643f1b04163f01d9e8
parent 0ea2c80d8d508dfb6480cd0e53eb32a8c7745788
parent b2b10f9ad814574a3559ff2d32cbe2d173d14aab
author The Android Open Source Project <initial-contribution@android.com> 1351700612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700612 -0700

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

* commit 'b2b10f9ad814574a3559ff2d32cbe2d173d14aab':