commit | 6017928f95a58282a007f3d198a2911cadfce881 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Sat Jul 01 03:48:25 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Jul 01 03:48:25 2017 +0000 |
tree | 6ec3564d75a51fc93b058cc9bb8cc69f629a5cd9 | |
parent | bce9e0e9398e85ff05fbf634b2b04016fe98317e [diff] | |
parent | 69c487548802327b5e3a994ba12df63639ed56f3 [diff] |
Merge "Merge "AOD: Pause FalsingManager prox sensor while showing AOD" into oc-dr1-dev am: 75c94b8788" into oc-dr1-dev-plus-aosp