OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Nov 2012 22:21:29 +0000 (14:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Nov 2012 22:21:29 +0000 (14:21 -0800)
Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4


Trivial merge