Files
paphonb 33ca738308 Merge remote-tracking branch 'aosp/master' into dev
# Conflicts:
#	Android.mk
#	AndroidManifest.xml
#	quickstep/res/drawable/ic_split_screen.xml
#	quickstep/res/values/dimens.xml
#	quickstep/src/com/android/launcher3/uioverrides/OverviewState.java
#	quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
#	quickstep/src/com/android/quickstep/TaskSystemShortcut.java
#	quickstep/src/com/android/quickstep/WindowTransformSwipeHandler.java
#	quickstep/src/com/android/quickstep/views/ShelfScrimView.java
#	quickstep/src/com/android/quickstep/views/TaskThumbnailView.java
#	res/layout/launcher.xml
#	res/values/dimens.xml
#	res/values/styles.xml
#	src/com/android/launcher3/DeviceProfile.java
#	src/com/android/launcher3/graphics/LauncherIcons.java
#	src/com/android/launcher3/model/PackageUpdatedTask.java
#	src/com/android/launcher3/views/ScrimView.java
#	src/com/android/launcher3/views/SpringRelativeLayout.java
2018-10-20 18:56:18 +07:00
..