tree ec8d394716568e68b67599600684185fc0a8cf78
parent 790f8912a37c1073d98138e78cef76cf50cb0e5a
parent 914de104b3b9861364b247aeb8d244e30744c757
author Matt Pietal <mpietal@google.com> 1562198105 -0700
committer android-build-merger <android-build-merger@google.com> 1562198105 -0700

Merge "Resolver - 'Always' button broken for non VIEW cases" into qt-dev
am: 914de104b3

Change-Id: I5583dde27c46f7130a540fce1476400767e7ec98