YQ-DemoGit
  1. YQ-DemoGit

base

Public

Commits

Patrick ScottAndroid Git Automerger
7168231a40a + 5b7ea0146dc
Patrick Scott authored and Android Git Automerger committed 9521e257bc8M
am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2

Merge commit '5b7ea0146dcfd5564d894d4cf0104919775feb36'

* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
  DO NOT MERGE
Showing diff to7168231a40a