OSDN Git Service

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

Change-Id: I4c337b36f6b5fee25a6bd03d71caac46519c8154


Trivial merge