diff options
| author | Dante Russo <drusso@codeaurora.org> | 2012-11-27 13:57:11 -0800 |
|---|---|---|
| committer | Dante Russo <drusso@codeaurora.org> | 2012-12-14 16:45:15 -0800 |
| commit | 711802495230021977102cfe7e6fe9a759a5b068 (patch) | |
| tree | 4532e4a19d5e19fba1cb6c37f1877e0ead88703e /utils/loc_log.cpp | |
| parent | a2b89ff92f325a14be250217b3b1e9d122400ab9 (diff) | |
| parent | 63b6b8f2245c72fbd5c3fb8cbcd1ead49be795fc (diff) | |
| download | gps-711802495230021977102cfe7e6fe9a759a5b068.tar.gz | |
Merge jb into jb_2.5
Features ULP, IPV6, DELEXT disabled
Conflicts:
loc_api/Android.mk
loc_api/libloc_api-rpc-50001/*
loc_api/libloc_api_50001/*
loc_api/loc_api_v02/*
loc_api/ulp/inc/ulp.h
utils/*
Change-Id: I846352d0addca89d4ffc3b114b774926b23e930d
Diffstat (limited to 'utils/loc_log.cpp')
| -rw-r--r-- | utils/loc_log.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/loc_log.cpp b/utils/loc_log.cpp index e4fb76c..8b064ec 100644 --- a/utils/loc_log.cpp +++ b/utils/loc_log.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2011 Code Aurora Forum. All rights reserved. +/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -9,7 +9,7 @@ * copyright notice, this list of conditions and the following * disclaimer in the documentation and/or other materials provided * with the distribution. - * * Neither the name of Code Aurora Forum, Inc. nor the names of its + * * Neither the name of The Linux Foundation, nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * |