OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:36:47 +0000 (15:36 -0700)
Change-Id: I1bfc1867c44e5793876b1bd237b134cc8357e25a


Trivial merge