tree ff34aed5a0a3287ac9cb73c2158cad8479caf603
parent 0403583c4551cf724b247ed61f78dd92d962d11c
parent a5ed815d6b5cb31c6b809eadc1b5a91f578c988b
author The Android Open Source Project <initial-contribution@android.com> 1337875434 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337875434 -0700

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

* commit 'a5ed815d6b5cb31c6b809eadc1b5a91f578c988b':