tree e2af7aface20b033ee71210f4bfdfec6cd1dd674
parent 9ad9bc1ca45bc446fb77fea0976de07a36144dbf
parent 4d513f547c5046546ee440485fd5f4ec484f84e0
author The Android Open Source Project <initial-contribution@android.com> 1337183129 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337183129 -0700

am 4d513f54: Reconcile with jb-release nakasi-factoryrom-release

* commit '4d513f547c5046546ee440485fd5f4ec484f84e0':