am 3b696ab3: Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:46:30 +0000 (08:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 May 2012 15:46:30 +0000 (08:46 -0700)
commit5a63caa7d04aa05cd534880318cf0ed9bee3560a
tree1109294434a4c3c89dc25da2eb63f01e2c9af038
parentdc94f04ed1593cf209cb4dd5709f8b8345045b45
parent3b696ab3c80388a4f1a413d39d536d2858b9f4e5
am 3b696ab3: Reconcile with jb-release nakasi-factoryrom-release

* commit '3b696ab3c80388a4f1a413d39d536d2858b9f4e5':