| commit | 3f2c8122f0ac70659e55151d4c56e8ff11a26c14 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Tue Oct 14 17:30:23 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 14 17:30:23 2014 +0000 |
| tree | f9646d494c19eb1fc74c3b07309ad4afbf0ffa92 | |
| parent | fa72516ac9cf6eeb3a08711c7cf35e31479d5a7d [diff] | |
| parent | 3e1732907b41e69fbd6ddb13de6f47c845cb85c0 [diff] |
am 3e173290: am 05bbbebb: am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev * commit '3e1732907b41e69fbd6ddb13de6f47c845cb85c0': Surface: Leave object in unlocked state when unlockCanvasAndPost fails