OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Jan 2013 21:09:26 +0000 (13:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 29 Jan 2013 21:09:26 +0000 (13:09 -0800)
1  2 
default.xml

diff --cc default.xml
Simple merge