am 7a85c42b: Merge "Update generate-NOTICE.py to know about tzdata."

* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
  Update generate-NOTICE.py to know about tzdata.
This commit is contained in:
Elliott Hughes 2012-10-19 17:21:40 -07:00 committed by Android Git Automerger
commit 58d08711af
2 changed files with 1 additions and 17 deletions

View File

@ -65,22 +65,6 @@ SUCH DAMAGE.
-------------------------------------------------------------------
Copyright (C) 2007 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-------------------------------------------------------------------
Copyright (C) 2008 The Android Open Source Project
All rights reserved.

View File

@ -20,7 +20,7 @@ def IsUninteresting(path):
return True
if path.endswith("/notice") or path.endswith("/readme") or path.endswith("/caveats"):
return True
if path.endswith("/zoneinfo.dat") or path.endswith("/zoneinfo.idx") or path.endswith("/zoneinfo.version") or path.endswith("/zoneinfo/generate"):
if path.endswith("/tzdata") or path.endswith("/zoneinfo/generate"):
return True
return False