OSDN Git Service

Merge "advanced settings"
authorJoe Onorato <joeo@google.com>
Thu, 7 Apr 2011 01:45:33 +0000 (18:45 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2011 01:45:33 +0000 (18:45 -0700)

Trivial merge