OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 17:48:57 +0000 (09:48 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 17:49:04 +0000 (09:49 -0800)
Change-Id: I002801f6c16424a08d3fd27bc5018397da51311e

1  2 
default.xml

diff --cc default.xml
Simple merge