OSDN Git Service

Merge "resolved conflicts for merge of 07990cf2 to master"
authorJoe Onorato <joeo@google.com>
Tue, 7 Sep 2010 18:54:27 +0000 (11:54 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Sep 2010 18:54:27 +0000 (11:54 -0700)

Trivial merge