OSDN Git Service

Merge "Report the right error code from PropertyServiceConnection()" am: e4e69a174a
authorTom Cherry <tomcherry@google.com>
Sat, 15 Apr 2017 00:26:03 +0000 (00:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 15 Apr 2017 00:26:03 +0000 (00:26 +0000)
am: 022b96f1e5

Change-Id: I72e38a6a1699a75e117abee06d1e14bdf3c397bd


Trivial merge