OSDN Git Service

Reconcile with jb-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:14:13 +0000 (08:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 29 Jun 2012 15:14:13 +0000 (08:14 -0700)
commit14b961f6ef4ab2177765c3e64676f0735d934158
treee01d249ffbb48c76924dd7d14a962989f83bb8a6
parent51e332a88899b86c2f706e8ad164877665fe319a
parent26d26a7a64a982e2f53ddbf59014877c986434dd
Reconcile with jb-release

Change-Id: Iba9ed40f75d1d8519d5052fa4dd5fd6796cf8e24