OSDN Git Service

resolved conflicts for merge of de43dd8c to dalvik-dev
authorElliott Hughes <enh@google.com>
Fri, 25 Jun 2010 15:06:32 +0000 (08:06 -0700)
committerElliott Hughes <enh@google.com>
Fri, 25 Jun 2010 15:06:32 +0000 (08:06 -0700)
Change-Id: Id5c74939c8f1bd6441ca8a49c452ba972068696e


Trivial merge