Quote:

Originally Posted by

Now I have this problem:

I forked android_frameworks_base, android_hardware_msm7k, android_hardware_libhardware from ICS-ACE for complete compiling, but Waceland_ACE merge they wrong and, for example, I have:





Code: <<<<<<< HEAD // TODO: move away from static state once 5587429 is fixed. protected static boolean sPolicyDataEnabled = true; ======= protected boolean mPolicyDataEnabled = true; >>>>>>> e3fc4d0ba9f68910f3a9cbecf266073bd28e1f9e

Code: <<<<<<< HEAD // TODO: move away from static state once 5587429 is fixed. protected static boolean sPolicyDataEnabled = true; =======

Code: >>>>>>> e3fc4d0ba9f68910f3a9cbecf266073bd28e1f9e

Code: protected boolean mPolicyDataEnabled = true;

I need to remove:andfor have only:It's really boring and laborious.Now I have to go out, I'll cotinue it later.