tree 8caf772f6974c1af2dc23eb32a6aa66c1743ce97
parent d10202f8f3805c0b6c7c86d958d78b044813571a
parent 0af1d367dfec325bc17654c3a6a3d42cb4f0ff72
author Felipe Leme <felipeal@google.com> 1571429686 -0700
committer android-build-merger <android-build-merger@google.com> 1571429686 -0700

[automerger skipped] Merge changes from topic "user_templates" into qt-qpr1-dev am: 8959c2dd6b
am: 0af1d367df -s ours
am skip reason: change_id Iaef9db6216a7b18bf6f1f3e19f4a7428ec99f1da with SHA1 09a7f2df68 is in history

Change-Id: I41856fc9bb6460fbcc0f83d1c036d2215ee66218