OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jan 2013 17:40:23 +0000 (09:40 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 8 Jan 2013 17:40:30 +0000 (09:40 -0800)
Change-Id: I985699416e73ec7bb24b60d46b5c52a06ab385ca

1  2 
default.xml

diff --cc default.xml
Simple merge