OSDN Git Service

Merge "Import broadcast_ring.h from GVR (reland)" into oc-dev am: afe7df1a3f
authorMichael Spang <spang@google.com>
Fri, 14 Apr 2017 17:05:28 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 17:05:28 +0000 (17:05 +0000)
am: 514b8a3c9e

Change-Id: I1c11f32584686de225eee03e3ae62097f8be4985


Trivial merge