diff options
author | Irfan Sheriff <isheriff@google.com> | 2010-12-06 10:42:58 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-06 10:42:58 -0800 |
commit | 02047f7e88f1d78b29d6d93dc521df279398505d (patch) | |
tree | aa57a48b0576f2bb6a6908ac584ec6c939cd7df5 | |
parent | 5b44aece8cacafeedfa474533a04cca5e74f4ae5 (diff) | |
parent | 18cbfecd8ab587fa049dfc668755a6bd6ddb10d9 (diff) | |
download | frameworks_base-02047f7e88f1d78b29d6d93dc521df279398505d.zip frameworks_base-02047f7e88f1d78b29d6d93dc521df279398505d.tar.gz frameworks_base-02047f7e88f1d78b29d6d93dc521df279398505d.tar.bz2 |
am 18cbfecd: (-s ours) am bd3dd73b: Merge "DO NOT MERGE Avoid nullifying dhcp target" into gingerbread
* commit '18cbfecd8ab587fa049dfc668755a6bd6ddb10d9':
DO NOT MERGE Avoid nullifying dhcp target
0 files changed, 0 insertions, 0 deletions