OSDN Git Service

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


Trivial merge