OSDN Git Service

reovle conflicts for cc089099
authorshared_user android-merger-prebuild <android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)
committershared_user android-merger-prebuild <android-merger@google.com>
Tue, 18 Jan 2011 16:21:32 +0000 (08:21 -0800)
commitbe7ca98a86a6fc6de822a410c3234fbccd67fd0c
tree4150461ab9b8559c35fc4cd11c3dc0a65048fc71
parent73f2e196dbfc81a9d3cf9d49bda72277374586c2
parentcc08909978b98db3dd362d33be57b6c5c1960ba5
reovle conflicts for cc089099

Change-Id: Ia449a3a3dc13928afb5c6ab6f4dcdf6eb049372b