OSDN Git Service

resolve merge conflicts of 695f21a66189 to oc-dr1-dev
authorIan Pedowitz <ijpedowitz@google.com>
Thu, 8 Jun 2017 00:47:38 +0000 (17:47 -0700)
committerIan Pedowitz <ijpedowitz@google.com>
Thu, 8 Jun 2017 02:52:10 +0000 (19:52 -0700)
commita27856d443ce65271aa16ea22a7b413e9dd9c664
tree4afeb975ed16358471b680f56e07896b814fa5d6
parentdacd9ed19679fc2c6614620c7b97e9244797d25c
parent695f21a66189c851435c9dc41b4bee57a44aead5
resolve merge conflicts of 695f21a66189 to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifeffa55c7fb80b0f327ecc5b50cefeca9db6457b
Merged-In: I558447f282bb54f13be1622c3f2528a383fbc3b7
packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java