tree 683b3f80cd48cd7a2bed7aa8e364ae68e10d447c
parent 4c433ea4b54f35282a73536715eca33818f88cb4
parent d371758dc0fa052fc9ff0d147b51a86ef0cb0f52
author Vishwath Mohan <vishwath@google.com> 1492704223 +0000
committer android-build-merger <android-build-merger@google.com> 1492704223 +0000

Merge "Enable CFI for the amrwbenc test." into oc-dev-plus-aosp
am: d371758dc0

Change-Id: Ib94c49152bd7cc87b2976e351d1647a1690e0619