Commit 96c9aef0 authored Dec 15, 2016 by Dan Willemsen Committed by android-build-merger Dec 15, 2016

Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem...

Merge "Fix CameraParameters2::OrderedKeyedVector::removeItem tautological-compare" am: 2142e027 am: 6b5f42dc am: 7be4072d
am: 18a2c141

Change-Id: If91589cf2abc50dd4f50217ee291d5c137f11e27

include/camera/CameraParameters2.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ private:
		}

		ssize_t removeItem(const KeyT& key) {
		size_t vectorIdx = (size_t) indexOfKey(key);
		ssize_t vectorIdx = indexOfKey(key);

		if (vectorIdx < 0) {
		return vectorIdx;