OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 18:06:06 +0000 (11:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 18:06:19 +0000 (11:06 -0700)
commitab295d3c95469de36b1ea80a7306e0f05854a4b1
tree8b13eb8170feba4f2f79dc9d2a198f1e66631e75
parentb4c9c2dff77e38ebca9efa7acce819ec80b14480
parentd1848babe1466a2fd43d4e1c31a5288d334c1d59
Merge from master

Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436
default.xml