OSDN Git Service

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


Trivial merge