Commit 94694468 authored by Diego Wilson's avatar Diego Wilson
Browse files

Merge p-keystone-qcom 

Conflicts:
	libm/Android.bp
	libm/sincos.c

Change-Id: Iae57a9d9673b31c5d47fb35ea0fbd3f495bbf522
parents c91e7e33 0182c4a4
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment