OSDN Git Service

Merge "[AWARE] Remove Publish/Subscribe Count configuration" into oc-dev am: 2ce80c83...
authorEtan Cohen <etancohen@google.com>
Wed, 29 Mar 2017 20:31:37 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 29 Mar 2017 20:31:37 +0000 (20:31 +0000)
am: 4e158866f8  -s ours

Change-Id: I4e056cfa17e44bcbbcc017208588effa398fa36f


Trivial merge