OSDN Git Service

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

Change-Id: Ic63f823621d8570b08a281820b5ce82e483aca0f


Trivial merge