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)
commit00ee1ab4c9bfe7ef72aab6abce27bdf0b17e3426
tree032785eb1e39019c667950bcc6734415c798dfea
parentab295d3c95469de36b1ea80a7306e0f05854a4b1
parentfe20f3cb92b3a1138e769106e5b3d7a805f41b4b
Merge from master

Change-Id: I01b9db3643d3eca22f1c7bd6ef35422ad9872273
default.xml