tree 8c35787cebe5509028b7dbf03ce11fcaf90de694
parent 5ac971625c01ce1bc18f678e8587c0f212251c79
parent ad2b78fa12b2b2f25aa9f2faeb872bd91f1420bc
author Mathias Agopian <mathias@google.com> 1296156273 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296156273 -0800

am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread

* commit '72abf01a8b6958ac1f86d36302a8462c4f51fd9d':
  Fix the ISurfaceComposer onTransact switch.