tree 66fa47ec5a5c37504e741b407896d046027060a2
parent 2a3047bc110de7c5c387c40f6cdcafa154cf6a49
parent 63224d9ea3703fb6afe7398c2314358d104e5121
author Randy Pan <zpan@google.com> 1475257395 +0000
committer android-build-merger <android-build-merger@google.com> 1475257395 +0000

Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f234
am: 63224d9ea3

Change-Id: I096f72242ffead904c5864fbb6c61e1cca1f0807