[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:e3d5eefd71
-s ours am skip reason: change_id I824b84ef8570ba501cf8137d695f98c335f92c7b with SHA1a54bf6ed5a
is in history Change-Id: Ia022041eb7988a024ddec38709aea2e430267efe
This commit is contained in:
commit
1933419e18