OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:48 +0000 (09:47 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Nov 2012 17:47:48 +0000 (09:47 -0800)
Change-Id: Ib1209178390b84af2e57494299fa9320050154e3


Trivial merge