diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-24 11:55:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 11:55:38 -0700 |
| commit | e742d42d5435a633241715428b3715ff4a30f0f8 (patch) | |
| tree | 92a5eb9d2abbb155c59610d0ea8c6dd0225be62e /proguard.flags | |
| parent | ebd93b52e666df18f942362c9af9634dbcad8840 (diff) | |
| parent | 41357ba8d6f2eae906a2af19a7296f47dbc6d286 (diff) | |
| download | packages_apps_Settings-e742d42d5435a633241715428b3715ff4a30f0f8.zip packages_apps_Settings-e742d42d5435a633241715428b3715ff4a30f0f8.tar.gz packages_apps_Settings-e742d42d5435a633241715428b3715ff4a30f0f8.tar.bz2 | |
am 41357ba8: am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286'
* commit '41357ba8d6f2eae906a2af19a7296f47dbc6d286':
Import revised translations
Diffstat (limited to 'proguard.flags')
0 files changed, 0 insertions, 0 deletions