tree ff13d9bdaefe93092487454cab511871c64f32e2
parent c8ae7db82bc8d2dda9996fe3060dcfe5eed982f2
parent 411b853adfa971ca58c7cb6ac1896206085814e6
author The Android Open Source Project <initial-contribution@android.com> 1339080729 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339080729 -0700

am 411b853a: Reconcile with jb-release

* commit '411b853adfa971ca58c7cb6ac1896206085814e6':