OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 10 Jul 2012 00:43:46 +0000 (17:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 10 Jul 2012 00:44:11 +0000 (17:44 -0700)
commitb76792303e3fede9a9aebce48ac99c535599d96e
tree4c1e2fd8ba22a779a54a08cbd7d7d75aab85e2aa
parentb5a0d13b2f49a9fb5e2ae619331c5e6f17c8f46e
parent6f056451e4eee641872a4a8b9165f9c9f9799d39
Merge from master

Change-Id: I89eab219489eb53f72ec16edf9a2d514963e7070
base-for-3.0-gpl.xml
base-for-3.1-gpl.xml
base-for-3.2-gpl.xml
default.xml