OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 17:07:51 +0000 (09:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 17:07:57 +0000 (09:07 -0800)
Change-Id: I56afc6c9637ed88b1d35b50e94ad16e4a571b7de

1  2 
default.xml

diff --cc default.xml
Simple merge