OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 19:31:23 +0000 (11:31 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 19:31:42 +0000 (11:31 -0800)
Change-Id: I01b9db3643d3eca22f1c7bd6ef35422ad9872273

1  2 
default.xml

diff --cc default.xml
Simple merge