OSDN Git Service

Merge "Channel updates from users lock fields from interference."
authorJulia Reynolds <juliacr@google.com>
Wed, 2 Nov 2016 01:20:17 +0000 (01:20 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 2 Nov 2016 01:20:23 +0000 (01:20 +0000)

Trivial merge