OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jan 2013 18:58:01 +0000 (10:58 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 28 Jan 2013 18:58:10 +0000 (10:58 -0800)
Change-Id: If2ca4db261e8ebd9bd684f09bdbba3df4ebc05a0

1  2 
default.xml

diff --cc default.xml
Simple merge