OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:33:03 +0000 (07:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 3 Oct 2012 14:33:03 +0000 (07:33 -0700)
Change-Id: I80b71067d1e628d18a19d94219fcfa1000133abf


Trivial merge