tree 2a1378817e7247e75483f38cbb8cf58f9facabf4
parent 17ed939b9398e635082344116ba32d3c69c59864
parent f5260299afcb6f2424ca4986513373c82d973e84
author The Android Open Source Project <initial-contribution@android.com> 1341343045 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1341343045 -0700

am f5260299: Reconcile with jb-release

* commit 'f5260299afcb6f2424ca4986513373c82d973e84':