OSDN Git Service

resolved conflicts for merge of 301b97ac to eclair
authorDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000 (12:26 -0700)
committerDianne Hackborn <hackbod@google.com>
Thu, 27 Aug 2009 19:26:44 +0000 (12:26 -0700)
commita5522f48043969db24b774a1a3de93eb4c029091
treed5d82843e6f352ddee5127025da8b06be250e42e
parent5276762c217d2bb0f8ca4842acca7870971b05ed
parent1f71fb78b8cb606a61c473b079e6465e7c6cc6ef
resolved conflicts for merge of 301b97ac to eclair

Change-Id: I0fb70cbe0a52006ad14f43a02c30b72aad457c48