OSDN Git Service

am 4f2f0997: am e60b0687: HWComposer now has its own concept of display IDs
authorMathias Agopian <mathias@google.com>
Fri, 24 Aug 2012 01:24:13 +0000 (18:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Aug 2012 01:24:13 +0000 (18:24 -0700)
* commit '4f2f099720ceb9ab19a88babfbbc1abb6e64538b':
  HWComposer now has its own concept of display IDs


Trivial merge