OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 16:51:32 +0000 (09:51 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 3 Aug 2012 16:51:39 +0000 (09:51 -0700)
commit87ea75948da70b18f0664ba6c1f11a381e3c36f5
treeee3ac08ed14d6451bbdda4a5025368797e2300c8
parentb76792303e3fede9a9aebce48ac99c535599d96e
parent73ce405ee0d574be6c589641a0807bd0c494485e
Merge from master

Change-Id: I0958c123291c4825727ec1945f7a0feead3c535d
default.xml