OSDN Git Service

Merge "Fix AdvertiseDataParsing test" am: 6f9710e6cd
authorroot <root@pawlowski-linux.mtv.corp.google.com>
Tue, 1 Nov 2016 01:56:03 +0000 (01:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 1 Nov 2016 01:56:03 +0000 (01:56 +0000)
commit531de9e1ae311dca1af32b733b275ed8fda24bb6
tree18dc26e8d08ea87edcd0720bdcfd31a84885d5c3
parentbd59914bd999244069ec0a8fbe085242911ac2a8
parentba85545e1ee02c6bfe0a4f0903171a91a5b31003
Merge "Fix AdvertiseDataParsing test" am: 6f9710e6cd
am: ba85545e1e

Change-Id: I59eb035a9a5776ec9aad53d7669d47adc9129345