Código:
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:608: ';' expected
>>>>>>> 5cdce2a... PIE
^
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:608: ';' expected
>>>>>>> 5cdce2a... PIE
^
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:608: not a statement
>>>>>>> 5cdce2a... PIE
^
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:608: ';' expected
>>>>>>> 5cdce2a... PIE
^
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:969: illegal start of expression
<<<<<<< HEAD
^
frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java:969: illegal start of expression
<<<<<<< HEAD
Enserio? Con perdón, pero, te olvidas de lo que la gente te explica? Se te explico esto no hace mucho...
No es hacer cherry-pick y listo, a compilar...
