PlaygroundICS/android_frameworks_base — comment on commit 44baa2af121374f73d38a498c6ee600ef16eecaf
File:  line 0
By LorDClockaN:

I merged and resolved everything. Don't know what is the issue here.. all alog are log and changes around them are added
Sent from HTC Desire HD running my IceColdSandwich

Twisted wrote:

>DisplayHardware: Set MDP composition flag correctly
>Change-Id: Id0c7172fe8578f3eb26bbe10a448a96fee1d72cd
>commit 0179465b3aad2654f4b1eb3e6aecdb647a27c551 1 parent a22a7ae1d0
>Naseer Ahmed authored 9 days ago
>existz committed a day ago
>
>LorDClockaN does not maintain commit history when resolving merge conflicts and many of the patches available on aospX would require reverting the LOG -> ALOG changes. This was handled by allowing LorDClockaN to cherry-pick first.
>
>These changes were previously present in this project, but required reverting a change before they were added that would cause massive corruption. These commits need to be checked to ensure they contain all of the same information previously present.
>
>---
>Reply to this email directly or view it on GitHub:
>https://github.com/PlaygroundICS/android_frameworks_base/commit/44baa2af121374f73d38a498c6ee600ef16eecaf#commitcomment-1029434