OSDN Git Service

Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc...
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 20 Jun 2017 02:05:56 +0000 (02:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Jun 2017 02:05:56 +0000 (02:05 +0000)
commitbfa1313800065e0acb308a5a543e054d280749df
tree2f8a5423ff1e8e8719ebf57bacac1dd666682f30
parentee0d03ddd25b999a4c48bfae65cc892ef6181061
parentc027c017e2852b8da151edfab2a47eb02c7a1b54
Merge "Merge "Remove legacy advertiser from map after it's no longer used" into oc-dev am: 271e0aa02a am: 50bad313e4" into oc-dr1-dev-plus-aosp
am: c027c017e2

Change-Id: I70ceaa225a9bcdffed6c7be1977f11795593a7cb