OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 21:46:31 +0000 (13:46 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 21:46:36 +0000 (13:46 -0800)
Change-Id: I2d7a11eee4a41d12a4927640840c5c45e5421988

1  2 
default.xml

diff --cc default.xml
Simple merge