OSDN Git Service

Merge "Allow ':' in property names." am: 04a2c850db
authorElliott Hughes <enh@google.com>
Wed, 31 May 2017 20:15:26 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 31 May 2017 20:15:26 +0000 (20:15 +0000)
am: 613a9738e3

Change-Id: Ie9730fe2834012de7387e9452783fb52a2f7714b


Trivial merge