| commit | 25c52b70faceb24cade0f5480c372de3f47bdf79 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Oct 01 12:04:08 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 12:04:08 2010 -0700 |
| tree | b8b761cfc2c9e64dd548c62f0440fb93ecfe2ecd | |
| parent | 3cda486cd23c3739d70681166979a3e0ea439ed3 [diff] | |
| parent | 340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74 [diff] |
am 340c5c42: Separate the Settings activity name into two different strings. Merge commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74' into gingerbread-plus-aosp * commit '340c5c42370eb9e9a8a1a84e7cf683dc7cf69c74': Separate the Settings activity name into two different strings.