tree 86e632c084f288d77cc8d41aec5546672b2c738d
parent 277680184de898e3b918bffb220a02a1c831e654
parent d4c1944784ee70f45b83560dbfe1760a4db2b5b8
author The Android Open Source Project <initial-contribution@android.com> 1337635715 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337635715 -0700

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

* commit 'd4c1944784ee70f45b83560dbfe1760a4db2b5b8':