| commit | 4ad8d219b6922ba2b33ef30921055360f1d29a3b | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Thu Oct 27 16:51:08 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 27 16:51:08 2011 +0000 |
| tree | e51a7338f44e50b639c1bf5ad4b819c4411bee48 | |
| parent | 253f544ffbe524a79ef528510f55252060e07370 [diff] | |
| parent | 32f7ac251b5bb45bc12390f5aedbeb097106f5f7 [diff] |
am 32f7ac25: (-s ours) Merge changes Ied79f3cb,Iaba87f49 into ics-mr1 * commit '32f7ac251b5bb45bc12390f5aedbeb097106f5f7': Import revised translations. DO NOT MERGE Restore deleted string still referenced from a layout.