OSDN Git Service

Merge "this should be @hidden"
authorJoe Onorato <joeo@google.com>
Wed, 24 Nov 2010 19:15:07 +0000 (11:15 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 24 Nov 2010 19:15:07 +0000 (11:15 -0800)

Trivial merge