OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 17:07:51 +0000 (09:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 Dec 2012 17:07:57 +0000 (09:07 -0800)
commitcdd2f5571740cfe4387a66beb6ac7727e65bd8e8
treeb9f959b5ce8422aa90fd51202773f64d6852967d
parentc75a48da0f9fcab4955fac047c8d3b3e06ff5c4f
parent596d9d99602be75146a84b9dd70d7eb672aaf7b9
Merge from master

Change-Id: I56afc6c9637ed88b1d35b50e94ad16e4a571b7de
default.xml