Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:13 +0000 (09:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Oct 2012 16:45:13 +0000 (09:45 -0700)
commita388b6f3158f06c3c2c6b8d16d35d87b9ec028a5
treea5d3611498ea911932102adc07667cfcb53eb7d5
parent7d0efc0fc33cc12e51698d91112c2b9186cf8631
parent18c4df9ba7855da05d74570ec7c6a45072af6bbb
parent028bf50ed89e7fd37fcc95f80589b187f74f1a14
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I354767f1c1a08ea76bfba48c1a8e3f0700f445b9