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)
commit8c9a56d57b416afd7a5aafce32ac741b904e4028
tree1d38ca438a30a7251d88b56c19849dc76d812156
parent207fe05ecb43a7839ba546ffae08f91f023bbe34
parente4b6c17240cd47bcf90698be38632772a6b331e8
Merge from master

Change-Id: I985699416e73ec7bb24b60d46b5c52a06ab385ca
default.xml