tree e64504e669ee3325127c17b29db7e48532072789
parent 6059e56d92b633a3a9426d417f67d2b323edfeb1
parent bdc642a346c0c484100a7e2afd85117930f9800b
author Pawin Vongmasa <pawin@google.com> 1568080126 -0700
committer android-build-merger <android-build-merger@google.com> 1568080126 -0700

[automerger skipped] Merge "OMX VTS: Move device resource files to data/local/tmp" into pie-vts-dev am: 0571e8e8dd am: 493686b38e -s ours
am: bdc642a346 -s ours
am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1 a54bf6ed5a is in history

Change-Id: I17e0c22c3d32ff905890093451705a056908e802