OSDN Git Service

resolve merge conflicts of 148db9dfa669 to oc-mr1-dev
authorJason Monk <jmonk@google.com>
Fri, 28 Jul 2017 17:29:01 +0000 (13:29 -0400)
committerJason Monk <jmonk@google.com>
Fri, 28 Jul 2017 17:29:01 +0000 (13:29 -0400)
commit27ceab924f8b354f1f4f4901e688000401e6adec
treea521e3baa99f943e4a34cf8df60ea48059efa6d5
parentac718ee66bacf16baf859b51de39ce443d68b496
parent148db9dfa669e6a0a571f58195911a4da43c658b
resolve merge conflicts of 148db9dfa669 to oc-mr1-dev

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Idc9270dda8225d8e36204a2bc4fd41c7b864ca1a
packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java