tree 8f165c37e7d30534b36be6c5caaba250fb5d3345
parent 1d8f57a1f423a1a6649df179f6ab0d4aeea05c03
parent a7ec8fa4d664f6ffdad038acbaa66b4f0915be46
author The Android Open Source Project <initial-contribution@android.com> 1338309900 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338309900 -0700

am a7ec8fa4: Reconcile with jb-release nakasi-factoryrom-release

* commit 'a7ec8fa4d664f6ffdad038acbaa66b4f0915be46':