OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 19:18:29 +0000 (11:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 19:18:29 +0000 (11:18 -0800)
commit454627192a21a9feafd80d3a4248ddf0d069331f
treeac8753db1d09abd025f6e2c005a625a311b94eab
parentded671af82db8f0b6f169a9aee96389ed0285382
parent70b1a769944706a2f2567b975e5d7e9284251154
Merge from master

Change-Id: Ib0e2fa7922857bd60e51ed7701fe640868ad07e6
default.xml