am fa4db9bc: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 6 Aug 2012 20:26:57 +0000 (13:26 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Aug 2012 20:26:57 +0000 (13:26 -0700)
commit5f2cc45c0dcb272056e6dbf5d6ae88541d076335
tree33c11d62ff832313af916afd858d3082a355c7ef
parent3043e7e3efc88db6ed19c07d5726c2b2ab2c7eb7
parentfa4db9bcb394b4d77c55e716f7f0001b9fa74cbd
am fa4db9bc: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'fa4db9bcb394b4d77c55e716f7f0001b9fa74cbd':