tree 30bf0cc961319af3a649599174894bf9f0439966
parent f7e3bb256bf3fbbc1d7239140501bfb5c4800aaa
parent e870f7dfeae928f61bb57a62685199cab41bcdc4
author The Android Open Source Project <initial-contribution@android.com> 1340720479 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340720479 -0700

am e870f7df: Reconcile with jb-release

* commit 'e870f7dfeae928f61bb57a62685199cab41bcdc4':