summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-12-06 10:42:58 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-12-06 10:42:58 -0800
commit02047f7e88f1d78b29d6d93dc521df279398505d (patch)
treeaa57a48b0576f2bb6a6908ac584ec6c939cd7df5
parent5b44aece8cacafeedfa474533a04cca5e74f4ae5 (diff)
parent18cbfecd8ab587fa049dfc668755a6bd6ddb10d9 (diff)
downloadframeworks_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