OSDN Git Service

Merge "Eliminate deadlock in magnification." into nyc-dev
authorPhil Weaver <pweaver@google.com>
Wed, 6 Apr 2016 17:49:46 +0000 (17:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 6 Apr 2016 17:49:48 +0000 (17:49 +0000)

Trivial merge