OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 18:06:06 +0000 (11:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 18:06:19 +0000 (11:06 -0700)
Change-Id: I0cecc81f9b34cb6d965d2a8528ced3f45d931436

1  2 
default.xml

diff --cc default.xml
Simple merge