OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Sep 2012 14:41:05 +0000 (07:41 -0700)
Change-Id: I190165deaba5ac670791cca5ab2da7d4aefd1d5f


Trivial merge