tree 4377e3dcadcfbda9d688f0db9ea250c321a40b60
parent 77282e3805ee2be7fd48291b85e1269dc1e5755f
parent ac678eb7b509b1b03c6a5cd13e1a060660af73d3
author The Android Open Source Project <initial-contribution@android.com> 1354066415 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354066415 -0800

am ac678eb7: (-s ours) am 4851b052: am 8ef1e64a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'ac678eb7b509b1b03c6a5cd13e1a060660af73d3':