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:05:51 +0000 (09:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Sep 2012 16:05:51 +0000 (09:05 -0700)
Change-Id: I02113763b6c6dfd96cf69377e244412d647a54f4


Trivial merge