OSDN Git Service

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


Trivial merge