OSDN Git Service

Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074...
authorHall Liu <hallliu@google.com>
Thu, 6 Jul 2017 20:29:02 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:29:02 +0000 (20:29 +0000)
am: 0dda017310

Change-Id: I54c1be96f0c5521505f1f2f19103ccf3605e99f2


Trivial merge