tree 70a16acb888edf8ddebb0f5b4f2d306a763b56e0
parent b2f98ef317abd2c26abab97f30d44e1294952125
parent 97d59168955c9fd0161b68153dc5b226fc3a5bee
author The Android Open Source Project <initial-contribution@android.com> 1337721676 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337721676 -0700

am 97d59168: Reconcile with jb-release

* commit '97d59168955c9fd0161b68153dc5b226fc3a5bee':