tree f57a359fa883ebc47e55ce789e874a30db34409a
parent 62daa29f7d7005a26a36089f2c7fdf91ce464003
parent 28a9a1a61ece4ceac9a256c19b1e76fd935e4e11
author Jakub Pawlowski <jpawlowski@google.com> 1493070476 +0000
committer android-build-merger <android-build-merger@google.com> 1493070476 +0000

Merge "Merge "Get rid of the IAdvertiserCallabck" am: 7503b11b14 am: 2fb02a252c am: 526719a1a2" into oc-dev-plus-aosp
am: 28a9a1a61e

Change-Id: I1b3a962d28ff95aaf147afb0032ab7bc6495611b