OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Dec 2012 19:29:34 +0000 (11:29 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Dec 2012 19:29:50 +0000 (11:29 -0800)
commitded671af82db8f0b6f169a9aee96389ed0285382
treea22ea58f1ff72185bc25f5bc72444b40b98c5458
parentcdd2f5571740cfe4387a66beb6ac7727e65bd8e8
parentb1bab4dc6628e2b254307613f5d56f5331646777
Merge from master

Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4
default.xml