Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:39:26 +0000 (07:39 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 15 Oct 2012 14:39:26 +0000 (07:39 -0700)
commitb04853d02d28d726088cc3a17e8494d72b94832d
treec76956b9eb47b959d263b1a004b573b1c5f4d837
parenta7048da3f65a29745c74fc2f77a79f338b42abb7
parent6cf5cc66645acb39168ecd05c3cd8bbc8421a20c
parent63d37df08d838586e3ef84e12e11dfbdafef52e2
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I36b01d357124ec3cc9a4301ade13a44c2c524a3a