Merge branch 'sm7225_r_fp4' into Bitra2
diff --git a/1.2/Android.bp b/1.2/Android.bp,bak
similarity index 100%
rename from 1.2/Android.bp
rename to 1.2/Android.bp,bak