OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:19:31 +0000 (15:19 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Dec 2012 23:19:31 +0000 (15:19 -0800)
Change-Id: I2d8ac7dc080c9f3c400d4a7bde4df1dd892ffba4


Trivial merge