tree e00ec60c16d2de3de4bb72d373542df9b5c287ec
parent 185285592f46629f8027c09bdc4e98365f0b62b1
parent 271e0aa02a34b14f77beed341400dd0f9da76371
author Jakub Pawlowski <jpawlowski@google.com> 1497923221 +0000
committer android-build-merger <android-build-merger@google.com> 1497923221 +0000

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

Change-Id: I9e8645c808d1b1cbee242e8a953be93fbf71e4e1