OSDN Git Service

Merge commit 'eee12419' into manualmerge
authorDianne Hackborn <hackbod@google.com>
Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)
committerDianne Hackborn <hackbod@google.com>
Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)
commitb50c768a8a9662033185e063f9e433971c1b6e2d
tree60373241ec6ddbc211632bda6f429ec52813a04c
parentff3b5a828ea1f7409af4475898689804bed10ede
parenteee12419384067797c1b672a3a07e81dc2315a84
Merge commit 'eee12419' into manualmerge