OSDN Git Service

resolve merge conflicts of 0e680785e4bc502a0237b716378ccb7322c8c1f8 to qt-r1-dev
authorDave Mankoff <mankoff@google.com>
Fri, 19 Jul 2019 20:29:31 +0000 (16:29 -0400)
committerDave Mankoff <mankoff@google.com>
Fri, 19 Jul 2019 20:29:31 +0000 (16:29 -0400)
commit3486cf4d0b0ab40f8e1a26a7c314c485f098f906
tree33e6e2f95d97669d015223a1ab50223d1cf95861
parent1ec1ecb364f862ce70f23cfefaa05f8aa4aff66d
parent0e680785e4bc502a0237b716378ccb7322c8c1f8
resolve merge conflicts of 0e680785e4bc502a0237b716378ccb7322c8c1f8 to qt-r1-dev

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idf6ca46cd849b6d363fd5f1633877224141a7943
packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java