Commit af01b38e authored Feb 06, 2018 by Divya Sharma

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

parents 7a7cef8b 8a0f94c4

Expand all Show whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please to comment