tree 79c397da75c4f9974be99b7921ce797b82134689
parent 41ba2079db2bcfd8f2538bb39a1a8ccc737b3aa5
parent 29a68645cdf627f6caa85621609a6b7dec3e0418
author Pawin Vongmasa <pawin@google.com> 1566527030 -0700
committer android-build-merger <android-build-merger@google.com> 1566527030 -0700

Merge "Codec2 VTS: Move device resource files to data/local/tmp am: f08d61d30e am: 6922c66501" into qt-r1-dev-plus-aosp am: 483a29ee63
am: 29a68645cd

Change-Id: I13e9310f41872a1d65f162908852b54e952135c4