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)
Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a


Trivial merge