OSDN Git Service

Merge from ics-mr1, add torospr
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Mar 2012 19:15:33 +0000 (12:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Mar 2012 19:15:33 +0000 (12:15 -0700)
1  2 
default.xml

diff --cc default.xml
Simple merge