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:24:02 +0000 (20:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:24:02 +0000 (20:24 +0000)
am: 771a872178

Change-Id: Iffc87ee2b889302f0cd011f8a07ef19e6c6f916d


Trivial merge