OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Jan 2013 17:03:24 +0000 (09:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 17 Jan 2013 17:03:31 +0000 (09:03 -0800)
Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6

1  2 
default.xml

diff --cc default.xml
Simple merge