OSDN Git Service

am 8d3cf106: am d4b38fe5: am 647e0df0: Merge "Surface: Leave object in unlocked state...
authorJesse Hall <jessehall@google.com>
Mon, 13 Oct 2014 22:35:45 +0000 (22:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 13 Oct 2014 22:35:45 +0000 (22:35 +0000)
* commit '8d3cf106aa53ccf03c9f57c4e3b4af5799e2b530':
  Surface: Leave object in unlocked state when unlockCanvasAndPost fails


Trivial merge