Commit 1a630c36 authored Jun 21, 2019 by Mohammad Islam Committed by android-build-merger Jun 21, 2019

Merge "Prevent definitions of expected.h from being included twice" am: 99087dec

am: 040df27b

Change-Id: I2a182cf6e4d66523eda1d76382bc986c4224d110

base/include/android-base/expected.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,8 @@
		* limitations under the License.
		*/

		#pragma once

		#include <algorithm>
		#include <initializer_list>
		#include <type_traits>