OSDN Git Service

Merge from master
authorConley Owens <cco3@android.com>
Fri, 26 Oct 2012 17:02:08 +0000 (10:02 -0700)
committerConley Owens <cco3@android.com>
Fri, 26 Oct 2012 17:02:22 +0000 (10:02 -0700)
Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581

1  2 
default.xml

diff --cc default.xml
Simple merge