OSDN Git Service

Merge "Prevent abuse of property overrides"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 25 Jan 2017 01:42:59 +0000 (01:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 25 Jan 2017 01:43:01 +0000 (01:43 +0000)

Trivial merge