OSDN Git Service

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


Trivial merge