OSDN Git Service

am 2b24add3: (-s ours) Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Jul 2012 22:06:05 +0000 (15:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 31 Jul 2012 22:06:05 +0000 (15:06 -0700)
commita33bb8fc825007a86b10393df6d9d2a6deb991e4
tree3ff493063c90ece56f6faeb822fa3dcf8317120c
parentb3bcc46c362408e78c935543b0f7a519e4d6ed87
parent2b24add32eb6d0250581465bdc6961114cca86c3
am 2b24add3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '2b24add32eb6d0250581465bdc6961114cca86c3':
  Revert "Minimal changes to support multi-display HWC"