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:14 +0000 (20:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:26:14 +0000 (20:26 +0000)
commit0a3dba1f4e66245663b6448b0141bd81aeb495c1
tree6f8fd2aea566930b48e9540e29a818deeb92ec84
parent6a581b784301a30c196aa0a0c2ec9ad7bff49b5f
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: I39f3249969f21855e6a0088ac5fd4b4aa8a778b0