Conflicts: src/com/android/launcher3/LauncherClings.java Change-Id: Idd2e6d54180315854216cfc868cd36297dcb95d9