tree 64ce10f5d1bc40fe7cdcdad70bdb733e33eb1f6d
parent caf3e9568d41c8a37212b56571026ebba43089c0
parent 02e9e32b9077d60e0a26ebd9504e11f5e81685ea
author Nazanin Bakhshi <nazaninb@google.com> 1559348832 -0700
committer android-build-merger <android-build-merger@google.com> 1559348832 -0700

Merge "Supported data enabled override for different scenarios" into qt-dev
am: 02e9e32b90

Change-Id: Ibf541df3b68f476257f79ff458b55edf0efba9db