OSDN Git Service

resolve merge conflicts of 10357a7 to master
authorJason Monk <jmonk@google.com>
Tue, 26 Jul 2016 13:22:18 +0000 (09:22 -0400)
committerJason Monk <jmonk@google.com>
Tue, 26 Jul 2016 14:00:39 +0000 (10:00 -0400)
commitac3dec905f4cff9e1e93bc0fa2f9ae1440d3346e
treef160c70fd70fe7497a26d1146bdffdb70fc25e96
parent8d91725d6c9e258105169e776cf747d118282508
parent10357a799b21f549e9f1d490361d1ac690780e82
resolve merge conflicts of 10357a7 to master

Change-Id: I2c185ee5949ff5a67175c08b86026a060b69dc06
packages/SystemUI/src/com/android/systemui/qs/QSDetail.java