| commit | 70368d62fa1ac98868df86029d1197df09d9edd6 | [log] [tgz] |
|---|---|---|
| author | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 20 13:01:13 2016 +0530 |
| committer | Lalit Kansara <lkansara@codeaurora.org> | Tue Dec 20 13:01:35 2016 +0530 |
| tree | 5977f0ca297454f994c8d20d1bfc9b0ee3fb7d59 | |
| parent | 7d7c2429bc2c7d245bceff9b53fa8222bab0ba3c [diff] | |
| parent | 2db9f6c5bd3ecfa9c1024563acd244abc98256ef [diff] |
Back_Merge_N_MR1_To_Dev Merge N MR1 from release branch into development branch. Conflicts: packages/SystemUI/src/com/android/systemui/qs/QSPanel.java packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardStatusBarView.java Change-Id: Ibca60febc91633023713fe99d9370a94813e1fcb