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:51:39 +0000 (08:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 10 Aug 2012 15:51:39 +0000 (08:51 -0700)
Change-Id: Idae4db637990d9326dffba6d0679f520f7c69da0


Trivial merge