tree 96e247734e7538b44169526e2345a50b44ab8726
parent 62ebde89852ea371e45f68c061901c27de21827a
parent 7e97085ee71d4c128f5fe05aaabe86500a379476
author Hall Liu <hallliu@google.com> 1499366445 +0000
committer android-build-merger <android-build-merger@google.com> 1499366445 +0000

Merge "Merge "Add a reason arg to streamStateUpdated" am: 6ba3829074" into stage-aosp-master
am: 7e97085ee7

Change-Id: If496a76fc79f0f402e8a0c509f1d370903ab535a