tree 0ad13d701944478a833e6c670a628f73d5a39aa4
parent 6b3624bfb853718a5d3afdc8a3e34ab7bea5f6b4
parent 4e02b89a1e893ca3537ea95170f67de9fa2b923c
author Philipp Weiß <phweiss@google.com> 1482257899 +0000
committer android-build-merger <android-build-merger@google.com> 1482257899 +0000

Merge "DO NOT MERGE Rework Device Monitoring Dialog in Quicksettings" into nyc-mr2-dev am: 4d3aa8e8ab
am: 4e02b89a1e  -s ours

Change-Id: I88665a96717871a0a989ae69a840e1af62ce5b11