OSDN Git Service

Merge changes from topic 'property_service_protocol_v2' am: 3f6d599775
authorDimitry Ivanov <dimitry@google.com>
Wed, 25 Jan 2017 03:58:55 +0000 (03:58 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 Jan 2017 03:58:55 +0000 (03:58 +0000)
am: fc7be4575a

Change-Id: Idef9ac8ffbc458064121c43031de1a07a4300f90


Trivial merge