OSDN Git Service

Merge "Start filling in the system settings panel."
authorJoe Onorato <joeo@google.com>
Fri, 26 Nov 2010 21:27:05 +0000 (13:27 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 26 Nov 2010 21:27:05 +0000 (13:27 -0800)

Trivial merge