OSDN Git Service

resolve merge conflicts of daeafccfa962 to master
authorJason Monk <jmonk@google.com>
Fri, 26 May 2017 19:20:20 +0000 (15:20 -0400)
committerBenoit Lamarche <benoitlamarche@google.com>
Mon, 29 May 2017 09:10:28 +0000 (11:10 +0200)
commit769139da0397c5b2abf0f6d5fbcf3e2bd33276db
treed45b2009da1cd4d491a3f35b1e311669a77df852
parent6ea208d0594f35c2b5ec61e1668e1cd8371f4b76
parentdaeafccfa962d9ec3a72c6a2e96e0025383e204c
resolve merge conflicts of daeafccfa962 to master

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I6d45188c96c63af8e60a553f498bfa9fe1834f39
core/java/android/view/View.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionController.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/ExtensionControllerImpl.java
packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeExtensionController.java