tree 47f671147c2238e468a379a3458df4de76b3c1c3
parent c3860b3b526e77f8fdfa1e1a0d09031eeb60ddec
parent 24a94491e4011be260e4b8e683f8329abc945b1f
author Julia Reynolds <juliacr@google.com> 1502479709 +0000
committer android-build-merger <android-build-merger@google.com> 1502479709 +0000

Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev
am: 24a94491e4

Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5