Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Nov 2012 14:28:26 +0000 (07:28 -0700)
commit1273f1b7ace1772bc115f4252f2925de0c5c102d
tree84363855e22bd883dea8b56ac8418fb73017d96b
parent57b18438ad3905465813ea88c05bb0e045a4db86
parent7219980a19c026fb454c1decdd2eacd22691df6b
Reconcile with jb-mr1-release - do not merge

Change-Id: Ie34407add6de1a599529f03ac8954c792c400fbe