tree 70a16acb888edf8ddebb0f5b4f2d306a763b56e0
parent cfa6b0ab5007d48504c331d30a04fa3d3d498560
parent 30dce3d9b05a210943be9429f5615e0e277dd657
author The Android Open Source Project <initial-contribution@android.com> 1337635724 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337635724 -0700

am 30dce3d9: Reconcile with jb-release nakasi-factoryrom-release

* commit '30dce3d9b05a210943be9429f5615e0e277dd657':