| commit | 6d5b8951b13ac49a4ee395cfee75b26bc53f602a | [log] [tgz] |
|---|---|---|
| author | Ken Wakasa <kwakasa@google.com> | Thu Sep 30 11:39:09 2010 +0900 |
| committer | Ken Wakasa <kwakasa@google.com> | Thu Sep 30 11:54:31 2010 +0900 |
| tree | f874a2c5998fff17fe648d729d15a646cc710b01 | |
| parent | 3b6aa41cce9dafa48dfbb3e93ea856610de1f1e7 [diff] | |
| parent | 47ad0cf3bc288cef23877c45b67bf7f02147d1bc [diff] |
Merge commit '47ad0cf3' into manualmerge Conflicts: res/xml/language_settings.xml src/com/android/settings/LanguageSettings.java Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2