| commit | 4e4914b22b779e6376bb00ae20636175b2a70d8c | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <divyash@codeaurora.org> | Tue Feb 27 08:32:05 2018 -0800 |
| committer | Divya Sharma <divyash@codeaurora.org> | Tue Feb 27 08:32:05 2018 -0800 |
| tree | f4ebc5eae2c99e20aceefcc9ffc3de19782f0fbe | |
| parent | dbed40a3cd31af821ea99c605664908d67df2747 [diff] | |
| parent | ed5d4d06907844e1c87a6ee17c4f2868a8cc6d56 [diff] |
PPR1.180219.001_AOSP_Merge Conflicts: core/res/res/values/config.xml core/res/res/values/symbols.xml packages/SystemUI/res/values/config.xml packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java telecomm/java/android/telecom/Call.java telecomm/java/android/telecom/Connection.java telecomm/java/android/telecom/ConnectionService.java Change-Id: I524d38a61608069028b3496a189118d8eff75f4b