Merge "Frameworks/base: Use || instead of |"

This commit is contained in:
Andreas Gampe
2015-03-17 20:28:52 +00:00
committed by Gerrit Code Review

View File

@@ -164,7 +164,7 @@ public class PathParser {
* @return array of floats * @return array of floats
*/ */
private static float[] getFloats(String s) { private static float[] getFloats(String s) {
if (s.charAt(0) == 'z' | s.charAt(0) == 'Z') { if (s.charAt(0) == 'z' || s.charAt(0) == 'Z') {
return new float[0]; return new float[0];
} }
try { try {