tree c9a100e55e20622f607a7153ee7883122b169312
parent 8910b60e61dc67839d739402a925c1636efe1dbb
parent 2f86b16c35b4c18dc0fb9ed8770558bfd09615ab
author The Android Open Source Project <initial-contribution@android.com> 1343429150 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429150 -0700

am 2f86b16c: Reconcile with jb-release

* commit '2f86b16c35b4c18dc0fb9ed8770558bfd09615ab':