OSDN Git Service

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


Trivial merge