diff options
| author | Eric Fischer <enf@google.com> | 2010-09-30 18:12:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 18:12:08 -0700 |
| commit | dcad41988f660a74ce762f23a5d76c948974605a (patch) | |
| tree | bcf7fd2e05e7c2549b8456559e87c1b75faff720 /include/ui | |
| parent | fcf0f5734cac12d744a3b0d0b40b210435217054 (diff) | |
| parent | cfba8c0337e9a8d55389bcae7caa7a8db230f711 (diff) | |
| download | frameworks_base-dcad41988f660a74ce762f23a5d76c948974605a.zip frameworks_base-dcad41988f660a74ce762f23a5d76c948974605a.tar.gz frameworks_base-dcad41988f660a74ce762f23a5d76c948974605a.tar.bz2 | |
am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711'
* commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'include/ui')
0 files changed, 0 insertions, 0 deletions