tree 5b7fadfa0aebceeaa997d7135ea7e79fc7eb63b2
parent 85328af49e65f290b4456dc41dc9100b6b1fab00
parent 9846b5392695baf21564edd9ec81cb39730a8df8
author yinxu <yinxu@google.com> 1520556887 +0000
committer android-build-merger <android-build-merger@google.com> 1520556887 +0000

Merge "Do not throw RuntimeException from stopScan()." am: 7ac5deaf38
am: 9846b53926

Change-Id: I09c905f0a7f54e3b24b94793d14f46ad9c56cf3c