OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:34:55 +0000 (10:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:34:55 +0000 (10:34 -0700)
Change-Id: I2574f76e658ad480d22c600a6e1e4f7b251a1749


Trivial merge