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)
commitf833e5153de07107faa5b6cc7d33c873e4cee291
tree6f8fd2aea566930b48e9540e29a818deeb92ec84
parent4e00c1fc32d243726ee0b5818797042553acc4da
parent1647883e9b6edee2f208586d633b29ec90cd60ec
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 7e97085ee7" into oc-dev-plus-aosp am: 60ec77baf9" into oc-dr1-dev-plus-aosp
am: 1647883e9b

Change-Id: I0587e3a021d4b0d36abb4971907a2faaea97b74e