tree 854a42ccbb100d7fbb1cae22329550eef9b2049e
parent 5f23cfe1f7b89508cc8aca91f06c94592d1ee0a8
parent f6e22d4f36acca728d28b87494387de02efd8102
author Jason Monk <jmonk@google.com> 1491242976 +0000
committer android-build-merger <android-build-merger@google.com> 1491242976 +0000

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

Change-Id: Ib70b009369497f3c11369b01093298bb287f432f