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)
commitb4c9c2dff77e38ebca9efa7acce819ec80b14480
treec53849d7f2484e89452b2635d30c211cd7afb987
parent87ea75948da70b18f0664ba6c1f11a381e3c36f5
parentf46b8df32efc4979bdca52bf52e83fd816819f60
Merge from master

Change-Id: I4bf730aa31e8695ba381c306641d4f98f7506581
default.xml