| commit | 4e6466f5ef16b2e34892d694e24317436966a4f9 | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Oct 01 12:06:18 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 01 12:06:18 2010 -0700 |
| tree | b8d56464ab605bfe15001a7d2eafaa0c606234b6 | |
| parent | ce0a7b2df0d6ce3d5a9bf063cde2e23b92ec7002 [diff] | |
| parent | 25c52b70faceb24cade0f5480c372de3f47bdf79 [diff] |
am 25c52b70: am 340c5c42: Separate the Settings activity name into two different strings. Merge commit '25c52b70faceb24cade0f5480c372de3f47bdf79' * commit '25c52b70faceb24cade0f5480c372de3f47bdf79': Separate the Settings activity name into two different strings.