tree 1431e40ea83ee6ccac6e1055390f9ee3e3a57309
parent 0659e8c71b84bf9af971019a6d9869b099d56149
parent 11e3dd699da571b33b2a0288ae5751fa5c634edb
author Neil Fuller <nfuller@google.com> 1634727134 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1634727134 +0000

[automerger skipped] Refresh the geonames data from upstream am: a4233dc044 am: 2ed2cc4e14 am: ad1b5836a9 am: d091468cae am: 11e3dd699d -s ours

am skip reason: Merged-In Ia7d5f698d6288a664ae54661971069096ab7ad47 with SHA-1 82e879207a is already in history

Original change: https://android-review.googlesource.com/c/platform/external/geonames/+/1862849

Change-Id: I5240d4162b4ed66b825e60f723c49c12670c6916