Reconcile with jb-release nakasi-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:41:11 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 May 2012 15:41:11 +0000 (08:41 -0700)
commit3b696ab3c80388a4f1a413d39d536d2858b9f4e5
treecd76ae29089ab62f8f6214f8b0b3b720a9bff619
parent3ea5096568f147941b4302070ffc2024bad8e18f
parentbe2d973bda7326d37d4112a7100b65000134418e
parentbe2d973bda7326d37d4112a7100b65000134418e
Reconcile with jb-release nakasi-factoryrom-release

Change-Id: Ie7f0fac996068219e01f8560eff0156987e931fb