tree a2f26d751e9852a58da834e7238f4d0cd6601554
parent 152d2acfd9b9254c725eaadf53ae148b44cf9397
parent 587e96145643ba7570730080aa4fe8865df3712a
author The Android Open Source Project <initial-contribution@android.com> 1367355846 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367355846 -0700

am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release

* commit '587e96145643ba7570730080aa4fe8865df3712a':