tree b39a4f67497c0529efe9876bf138762dc1dd9eb7
parent 2887a0a9bc3813dde4f813d9173274eae01b1ca3
parent 389a4eeb187fdbc5fd1f7caf5dff90f8a6e1d37a
author The Android Open Source Project <initial-contribution@android.com> 1337721693 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337721693 -0700

am 389a4eeb: Reconcile with jb-release

* commit '389a4eeb187fdbc5fd1f7caf5dff90f8a6e1d37a':