OSDN Git Service

Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Sat, 1 Jul 2017 03:48:25 +0000 (03:48 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 1 Jul 2017 03:48:25 +0000 (03:48 +0000)

Trivial merge