tree 728026e772433f4bb84e2aa3880c369f11554669
parent 08043caecb6ae7076cb0462151a4840f26cc7c87
parent 9056c8cf9d73e804b420ed4ad84601606399f4f7
author Qasim Javed <qasimj@google.com> 1487039745 +0000
committer android-build-merger <android-build-merger@google.com> 1487039745 +0000

Merge "Lower the BLE connection supervision timeout to 5s." am: 72caf0257f
am: 9056c8cf9d

Change-Id: I6f21dbda3394261573516f2684fef67c5a3d215d