tree c0808dbfcc8ebc32e7d42d4dffaf79159b3d8ed3
parent a7853c75b87e17c72a3df011e7cb9cb5a7aae758
parent de1f0d7607584c899736575cea7a3fe3744066d5
author Jakub Pawlowski <jpawlowski@google.com> 1497901238 +0000
committer android-build-merger <android-build-merger@google.com> 1497901238 +0000

Merge "Remove legacy advertiser from map after it's no longer used" am: 42b1578867
am: de1f0d7607

Change-Id: I89b5be7443dff10a3a52a0b6dbee76a5d34b8173