tree a882642cd11f8eece8ad416a79b1f2debe0a9366
parent 15137fa0d666787c5c7c8d2790ef6e1d846653ca
parent f7adf880264f57786bd33b3f8bb2395bd236b0bf
author The Android Open Source Project <initial-contribution@android.com> 1339431789 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339431789 -0700

am f7adf880: Reconcile with jb-release

* commit 'f7adf880264f57786bd33b3f8bb2395bd236b0bf':