OSDN Git Service

resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Nov 2010 18:20:37 +0000 (10:20 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Nov 2010 18:20:37 +0000 (10:20 -0800)
commit1206e872ce74aab253c39c3547bfaadc5e1f6011
treea98aed4569df620e437e4920d246241d3531dac0
parent92c243afae15567f166d0059db5aff13b8849596
parent09f774b7d3ad4e4205485b6997d44f7edd084598
resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

Change-Id: I103db47198ad09783aa6539cde271df0fdb9c594
DirectVolume.cpp
Volume.cpp