tree f4f7c1e559d02374d2136555948c6f57a06e1da5
parent 5c549b3a2a6c74f7a16dc1bdf3116264716534f9
parent a56b6e530a24ad18b451cc0bbefc819479e4fe3f
author Jason Monk <jmonk@google.com> 1491241860 +0000
committer android-build-merger <android-build-merger@google.com> 1491241860 +0000

Merge "QS: Add transient animations for bluetooth and wifi" into oc-dev
am: a56b6e530a

Change-Id: I43f7dafe192930ce5f3a78db5e586d62ba66a1c4