OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:26 +0000 (15:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:03:26 +0000 (15:03 -0700)
Change-Id: Ie13896fc0b2ee88acfea873eabe0baa520d88225


Trivial merge