diff options
author | Daniel Sandler <dsandler@android.com> | 2010-05-06 17:29:53 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-06 17:29:53 -0700 |
commit | 94886d9774d11b8bc93e56103d2f0ab61458ada0 (patch) | |
tree | 9375ec1fc694b916a5a3a39ac06a2151de1aac1d /libs/utils | |
parent | caa63341a890fee8dba9f3edc9c20ae5cec46b36 (diff) | |
parent | ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd (diff) | |
download | frameworks_base-94886d9774d11b8bc93e56103d2f0ab61458ada0.zip frameworks_base-94886d9774d11b8bc93e56103d2f0ab61458ada0.tar.gz frameworks_base-94886d9774d11b8bc93e56103d2f0ab61458ada0.tar.bz2 |
am ad2f9ff7: (-s ours) am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken
* commit 'ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd':
Fix "p.m." in lockscreen (locale: es).
Diffstat (limited to 'libs/utils')
0 files changed, 0 insertions, 0 deletions