tree b333008486ae5db3fadb72093cd3ffdd7e04c610
parent 86e2a2ab32910dd1fc805440f6565cd95598adf9
parent 89b1a4ee0ff9c5b174ae1a229029edcdbc34b74f
author Tim Murray <timmurray@google.com> 1524070826 -0700
committer android-build-merger <android-build-merger@google.com> 1524070826 -0700

Merge "ActivityManagerService: make bluetooth actually persistent" into pi-dev
am: 89b1a4ee0f

Change-Id: I9b8683effd9efccc7eb222e471d466bb529f451c