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:31:23 +0000 (20:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:31:23 +0000 (20:31 +0000)
am: 0efb0644fc

Change-Id: I9d46f6356833f384470fe4f02022e67c3937409d


Trivial merge