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)
commitdf404566509f125268b0d726022db8b41f157859
treead4ec94bc581f8271825405744a0aa2440a8108f
parent8c9a56d57b416afd7a5aafce32ac741b904e4028
parente046a83bf17b787e4cfd10181f6c007eeefe277c
Merge from master

Change-Id: If0f6099470a5098ed32efcfecbedd5cd60523db6
default.xml