tree 68a871428d73b28421de0a41ef6440b211c40499
parent f86243115aae7afa7b6c0464adf6cc8bd39dc5d2
parent 9ad2c67ab0da915134dc6020f57cce8f7cb30c70
author The Android Open Source Project <initial-contribution@android.com> 1368708503 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368708503 -0700

am 9ad2c67a: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '9ad2c67ab0da915134dc6020f57cce8f7cb30c70':