tree 135e1685cb4305bd4a34f97d29f6937ea9bfd821
parent cfedad3c2fdbd983e3a0bde5f1fcc58ba41247f2
parent 271e0aa02a34b14f77beed341400dd0f9da76371
author Jakub Pawlowski <jpawlowski@google.com> 1497923216 +0000
committer android-build-merger <android-build-merger@google.com> 1497923216 +0000

Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev
am: 271e0aa02a

Change-Id: Idddaa69cc89caaebcee0be1d4d27e28e2fd8ea51