OSDN Git Service

Merge from master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 17:48:57 +0000 (09:48 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Dec 2012 17:49:04 +0000 (09:49 -0800)
commit64d49f0ab50fcac0bf4592ddbf8f649fb17c6223
tree871235be35eca16b3d45271bab81c83c136b6a0c
parent43545df9292383471a1ccc7b4382be2198ded02b
parent0cc40d32e50323ae356f64b4d84af08ab963eef5
Merge from master

Change-Id: I002801f6c16424a08d3fd27bc5018397da51311e
default.xml