OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Jun 2012 13:13:22 +0000 (06:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Jun 2012 13:13:22 +0000 (06:13 -0700)
Change-Id: Ic4989b359b302c5d72751cdebae3433064770a29


Trivial merge