tree fc7decc67dbe67aea91d8fd63ff650c6841b4379
parent 5046535a4b9140296eeae350f7381c4226ed1a2a
parent e76b096cb7d6f94f1a1979fe8cb7ca1c10e3b4cf
author The Android Open Source Project <initial-contribution@android.com> 1340982992 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340982992 -0700

am e76b096c: Reconcile with jb-release

* commit 'e76b096cb7d6f94f1a1979fe8cb7ca1c10e3b4cf':