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