| commit | 05bbbebb475a2816d60c4a8ec140cccddc16b269 | [log] [tgz] |
|---|---|---|
| author | Jesse Hall <jessehall@google.com> | Mon Oct 13 22:35:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 22:35:45 2014 +0000 |
| tree | 561cba5eeec08fa394896877cb634b425fe75902 | |
| parent | 38e48c2f477d6908d7d29503749cbe4290b013a7 [diff] | |
| parent | 8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530 [diff] |
am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state when unlockCanvasAndPost fails" into lmp-dev * commit '8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530': Surface: Leave object in unlocked state when unlockCanvasAndPost fails