tree 513ecd82d2a8e3430628a98164b0366ffcc1c7e2
parent 451d1310922593c7719b30efa997eddac9ed6c27
parent c27ee87c8da93b6d609be1be18eaa0f0c7d07e98
author The Android Open Source Project <initial-contribution@android.com> 1340111991 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340111991 -0700

am c27ee87c: Reconcile with jb-release

* commit 'c27ee87c8da93b6d609be1be18eaa0f0c7d07e98':