OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 21:46:31 +0000 (13:46 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 21:46:36 +0000 (13:46 -0800)
commitc75a48da0f9fcab4955fac047c8d3b3e06ff5c4f
tree3ee827b5fb5e100b58149cdbd05c3f6c7282a2f8
parent64d49f0ab50fcac0bf4592ddbf8f649fb17c6223
parent50138b5a7f354c681720e425ce513e35495a529b
Merge from master

Change-Id: I2d7a11eee4a41d12a4927640840c5c45e5421988
default.xml