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)
Change-Id: I6345a9ea12d631334ae797bfd137552984f965c4

1  2 
default.xml

diff --cc default.xml
Simple merge