tree ab9fd3333ad3b5512b9dd1b6c3f85f56bd9dbe23
parent 4cdee7a61b140cf1a38b3d1eb1ac596525aa609b
parent e9792f851553841b9308a0527535105a0c6c2286
author The Android Open Source Project <initial-contribution@android.com> 1338309902 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338309902 -0700

am e9792f85: Reconcile with jb-release

* commit 'e9792f851553841b9308a0527535105a0c6c2286':