OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:31 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:31 +0000 (07:52 -0700)
Change-Id: I65f1a13c4c6203332e2184e5625dde8cc4cbb8f6


Trivial merge