tree fc5603af916a4100ff58dea6eb806dfab83e601a
parent 907194b1d2b99e8a8fae3606ed631ee31a347dcd
parent 97ade3390c66c145f94e497464947c581b60308d
author The Android Open Source Project <initial-contribution@android.com> 1339431949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339431949 -0700

am 97ade339: Reconcile with jb-release

* commit '97ade3390c66c145f94e497464947c581b60308d':