tree e6c7831ae708e5e9b245af8daa07082fb8dd3ea6
parent e1b52c097f08ed514186643b2ef28dca132441f6
parent 434b36ec6e56029ed9c5885ece03846309fd686a
author Edgar Wang <edgarwang@google.com> 1571073851 -0700
committer android-build-merger <android-build-merger@google.com> 1571073851 -0700

[automerger skipped] Merge changes I261ad35f,Id2611b3c into qt-qpr1-dev am: d76cc783f8
am: 434b36ec6e -s ours
am skip reason: change_id Ied7d97d4b4b0955981824d7342aabe74d06a0c1f with SHA1 6cb2feea7e is in history

Change-Id: I0edceda48793dd903f2e06edaac358d8c15377f7