tree 7ab067afb1b8595242de337f1450c022b0d6ddae
parent ac7304eefb2451710f2717cc5e1b1a5bbad0a552
parent 99565a9e80882658e1b4ea5b7c610d40d4d7cb0b
author The Android Open Source Project <initial-contribution@android.com> 1338309888 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338309888 -0700

am 99565a9e: Reconcile with jb-release

* commit '99565a9e80882658e1b4ea5b7c610d40d4d7cb0b':