tree 6ea42d7b4a26f538b7423fc86496d367313da829
parent f2d009c2aa4a75ed406622be0ea5995a422519d2
parent d2ecc6916eb1e447f0d5af52b44bdf60f25aa131
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582398134 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582398134 +0000

Merge "AmrnbDecoderTest: Added AndroidTest.xml to run test with atest" am: cb52a18fd1 am: d2ecc6916e

Change-Id: Ic32a511548147717d27461d82b055aec06624dd3