From: Dimitry Ivanov <dimitry@google.com>
Date: Wed, 25 Jan 2017 03:58:55 +0000 (+0000)
Subject: Merge changes from topic 'property_service_protocol_v2' am: 3f6d599775
X-Git-Tag: android-x86-8.1-r1~279^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=30fdd5d82de5cfe170e80fb9a95264cb7c73d86e;p=android-x86%2Fbionic.git

Merge changes from topic 'property_service_protocol_v2' am: 3f6d599775
am: fc7be4575a

Change-Id: Idef9ac8ffbc458064121c43031de1a07a4300f90
---

30fdd5d82de5cfe170e80fb9a95264cb7c73d86e