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:28:48 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 20:28:48 +0000 (20:28 +0000)
commit1fe8b2faeb7f7f3d1677ffcd1dd687978579352c
tree6f8fd2aea566930b48e9540e29a818deeb92ec84
parentf833e5153de07107faa5b6cc7d33c873e4cee291
parent0dda017310c6055f324884bbc63b655e03060d99
Merge "Merge "Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master am: 4c3be35123" into oc-dev-plus-aosp am: b91a596c9b" into oc-dr1-dev-plus-aosp
am: 0dda017310

Change-Id: I112ed17ae6bbbbef35a4d9ec3dc6d88b7ee639cd