Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:17:45 +0000 (12:17 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:17:45 +0000 (12:17 -0800)
commitf97103b5f0e5a65a81f60bbe39cd563b655ce020
tree84363855e22bd883dea8b56ac8418fb73017d96b
parentd881a0ce901d839282ba2d4d724b9ae25c9d4e89
parent6cf5cc66645acb39168ecd05c3cd8bbc8421a20c
parent7219980a19c026fb454c1decdd2eacd22691df6b
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a