Projects >> android-frameworks-base-with-remote-control-service >>17ff751695766db566cadf6fdb121065d006da39

Chunk
Conflicting content 
            resourcePath = base.resourcePath;
            resourcePathString = base.resourcePathString;
            nativeLibraryPathString = base.nativeLibraryPathString;
<<<<<<< HEAD
=======

            if (base.obbPathStrings != null) {
                obbPathStrings = base.obbPathStrings.clone();
            }

>>>>>>> ea6bf3628140283df24f2652b686d083b0d31ed9
            timeStamp = base.timeStamp;
            firstInstallTime = base.firstInstallTime;
            lastUpdateTime = base.lastUpdateTime;
Solution content 
            resourcePath = base.resourcePath;
            resourcePathString = base.resourcePathString;
            nativeLibraryPathString = base.nativeLibraryPathString;
            timeStamp = base.timeStamp;
            firstInstallTime = base.firstInstallTime;
            lastUpdateTime = base.lastUpdateTime;
File
PackageManagerService.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
         */
        PackageSetting(PackageSetting orig) {
            super(orig);
<<<<<<< HEAD

            userId = orig.userId;
            pkg = orig.pkg;
            sharedUser = orig.sharedUser;
        }

        public void copyFrom(PackageSetting base) {
            super.copyFrom((PackageSettingBase) base);
=======
>>>>>>> ea6bf3628140283df24f2652b686d083b0d31ed9

            userId = orig.userId;
            pkg = orig.pkg;
Solution content 
         */
        PackageSetting(PackageSetting orig) {
            super(orig);

            userId = orig.userId;
            pkg = orig.pkg;
            sharedUser = orig.sharedUser;
        }

        public void copyFrom(PackageSetting base) {
            super.copyFrom((PackageSettingBase) base);
File
PackageManagerService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Method signature
Variable