OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 20 Sep 2012 17:37:31 +0000 (10:37 -0700)
Change-Id: Ic61db28563308c2da38d7b2c2c12e0486914ea17


Trivial merge