OSDN Git Service

Merge "Surface:lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev
authorJohn Reck <jreck@google.com>
Wed, 22 Oct 2014 16:25:49 +0000 (16:25 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 22 Oct 2014 16:25:50 +0000 (16:25 +0000)

Trivial merge