tree 4e5643a3563f7d50da23c402d3118e695f1d5dea
parent a7c4fdbf0359cf4b1f7b29b46378c8ed43a8f151
parent 07d79aa3b0556fe79a15b99aee678bb6bce015cc
author Jakub Pawlowski <jpawlowski@google.com> 1489790460 +0000
committer android-build-merger <android-build-merger@google.com> 1489790460 +0000

Merge "Bluetooth 5 move timeout parameter (1/2)" am: d9f2f67a5f
am: 07d79aa3b0

Change-Id: I5f75034690784dd06d54345e60107ab7049e4da7