tree 4abf06826ce8772536ef1c02953f9c0efcc51295
parent 8f33b0bd960696f73589a7ecc20755612f8da4f7
parent 3f49d1dcef03ff06487950400af98c4768ee1d08
author Hansong Zhang <hsz@google.com> 1504301564 +0000
committer android-build-merger <android-build-merger@google.com> 1504301564 +0000

Merge "Fixed default values for Bluetooth energy calculations" am: 7c45962abd
am: 3f49d1dcef

Change-Id: Idfe642323575c80b40313007328012be1f3b03a9