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:26:33 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:26:33 +0000 (20:26 +0000)
am: 1647883e9b

Change-Id: I0587e3a021d4b0d36abb4971907a2faaea97b74e


Trivial merge