tree 3b0da685352a1392eeb3081ca02cbd52d93242f1
parent 186f4ac0f006de84d940a460bb44ee0e325fd1eb
parent b5e96b88ee726c926596d57ed78e0157036c74e3
author Marco Nelissen <marcone@google.com> 1549658495 -0800
committer android-build-merger <android-build-merger@google.com> 1549658495 -0800

[automerger skipped] Merge "Replace FOURC('a', 'b', 'c', 'd') with FOURCC("abcd")" am: ecfbd58de8 am: 1c0163ff3d
am: b5e96b88ee -s ours
am skip reason: change_id I8f9c75d19f2dcd0f0f31a082c0e98cd7eb6655a4 with SHA1 51087de7b6 is in history

Change-Id: I7a099063388fcca8e9262bf56c8534f939f64086