OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:22 +0000 (12:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Nov 2012 20:41:22 +0000 (12:41 -0800)
Change-Id: Ibc614d3e84ca8542758885e300b25263b2f9496e


Trivial merge