OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jan 2013 18:58:01 +0000 (10:58 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jan 2013 18:58:10 +0000 (10:58 -0800)
commiteba1eee60f074a417e8c290794a19e3c5e3b9724
treea1ea69af0ccce20fd63fc575d310584a913ffe4d
parentdf404566509f125268b0d726022db8b41f157859
parentbc65e60b0366a9c1de396ef58e996a3540d3d198
Merge from master

Change-Id: If2ca4db261e8ebd9bd684f09bdbba3df4ebc05a0
default.xml