tree 9ff71d414f8115c5fe41d4b4f0307ff25f8efd71
parent 6901fc18f527267636bedb94ad51594946e62c5c
parent d82363c19cbfea1d6505f2c21467df84d021d511
author The Android Open Source Project <initial-contribution@android.com> 1339080922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339080922 -0700

am d82363c1: Reconcile with jb-release

* commit 'd82363c19cbfea1d6505f2c21467df84d021d511':