OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jan 2013 22:14:39 +0000 (14:14 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jan 2013 22:14:46 +0000 (14:14 -0800)
Change-Id: I27f20b0f86cc964b6efe0a99e37798bb53737049

1  2 
default.xml

diff --cc default.xml
Simple merge