OSDN Git Service

Merge "resolved conflicts for merge of f00ee0f7 to master"
authorKonstantin Lopyrev <klopyrev@google.com>
Wed, 11 Aug 2010 04:49:04 +0000 (21:49 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 11 Aug 2010 04:49:04 +0000 (21:49 -0700)

Trivial merge