OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:13:12 +0000 (10:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 24 Sep 2012 17:13:12 +0000 (10:13 -0700)
Change-Id: I11d8713eb61744492dd1768c2e5f8e08f7bd3ee7


Trivial merge