OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:08:37 +0000 (09:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:08:37 +0000 (09:08 -0700)
Change-Id: I5722eee1f2907148388f35abfa36517177ca8f50


Trivial merge