tree 15b25065ea5f0d816cac3f0d30b9c76a8f82255f
parent 13cc47a6775cc471e1af80b8ec8a1fefb3cf3500
parent 2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae
author The Android Open Source Project <initial-contribution@android.com> 1350312188 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350312188 -0700

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

* commit '2ee4be8d3a8eb3355207d2549a7cd4ff6e0677ae':