tree 42b62f574c6d558506256987e19fbc22418eb63c
parent 23554978cdf0c7fd9f8fe0a69107b1b7adcc89a7
parent 0bd67e27da917c029cd991d9cd8ab1d4b8cad64b
author The Android Open Source Project <initial-contribution@android.com> 1337183157 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337183157 -0700

am 0bd67e27: Reconcile with jb-release nakasi-factoryrom-release

* commit '0bd67e27da917c029cd991d9cd8ab1d4b8cad64b':