tree 7efcc525a0d0df281219af08cfddea09674c8da8
parent a6ec82f47f758170515324136c4a99a925b54e09
parent cee3be2dfaca669b19ae0296282cb072de61236f
author The Android Open Source Project <initial-contribution@android.com> 1337635703 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337635703 -0700

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

* commit 'cee3be2dfaca669b19ae0296282cb072de61236f':