OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:03 +0000 (16:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:03 +0000 (16:07 -0700)
Change-Id: Id59555adc024005fc53103e2006e987e72283811


Trivial merge