tree 34e09adc7662e48774c0f21373088835ef4c7034
parent 0e9cf5151a265daec02d8bbc60d8a7c693fe51dd
parent 1c1577ba638828f6324a78314161afed73600cd2
author Jooyung Han <jooyung@google.com> 1551742654 -0800
committer android-build-merger <android-build-merger@google.com> 1551742654 -0800

[automerger skipped] Merge "Extract android_media_Utils.cpp as a lib" am: d14d29ca8f am: 6c7d8d31e0
am: 1c1577ba63 -s ours
am skip reason: change_id I1e1ea4bc1ff7022d8d9c42785c8c00e3ca153a50 with SHA1 cb1e896d57 is in history

Change-Id: I71f9c6824cc60d47861583d0e2b82521d0fa3276