OSDN Git Service

am 5032cb8b: (-s ours) am 2698f0cd: Revert hwcomposer HAL. DO NOT MERGE.
authorMathias Agopian <mathias@google.com>
Fri, 20 Aug 2010 13:27:03 +0000 (06:27 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 20 Aug 2010 13:27:03 +0000 (06:27 -0700)
commit14d12f9eae7b0252182450a039feb1a0ea020080
treebc2808b10b0a47935379e3037b7a0e71c7759882
parentdb23b533af0a7be384216bc612d0f8543622d468
parent5032cb8b03021a0874c296059833982daf0705b3
am 5032cb8b: (-s ours) am 2698f0cd: Revert hwcomposer HAL. DO NOT MERGE.

Merge commit '5032cb8b03021a0874c296059833982daf0705b3'

* commit '5032cb8b03021a0874c296059833982daf0705b3':
  Revert hwcomposer HAL. DO NOT MERGE.