| commit | af01b38e0a0664bc87b649248b0c13fbe0925193 | [log] [tgz] |
|---|---|---|
| author | Divya Sharma <divyash@codeaurora.org> | Tue Feb 06 17:14:35 2018 -0800 |
| committer | Divya Sharma <divyash@codeaurora.org> | Wed Feb 07 09:21:33 2018 -0800 |
| tree | 4eb2dd5486feb49367f2fd1a7d252bd95008cc74 | |
| parent | 7a7cef8b9a3396d324be180a72df84520b34ce37 [diff] | |
| parent | 8a0f94c4f08be740e18dc04232fa93a8af012685 [diff] |
PPR1.180130.002_AOSP_Merge Conflicts: packages/SystemUI/res/values-zh-rCN/strings.xml packages/SystemUI/res/values-zh-rHK/strings.xml packages/SystemUI/res/values-zh-rTW/strings.xml packages/SystemUI/res/values/dimens.xml services/usb/java/com/android/server/usb/UsbDeviceManager.java Change-Id: I52b89f86f95950bac281b6c35f2bd31cc15bb332