Merge "Prevent definitions of expected.h from being included twice" am: 99087decb9
am: 040df27b1d

Change-Id: I2a182cf6e4d66523eda1d76382bc986c4224d110
diff --git a/base/include/android-base/expected.h b/base/include/android-base/expected.h
index 08c9fb5..957a8a0 100644
--- a/base/include/android-base/expected.h
+++ b/base/include/android-base/expected.h
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#pragma once
+
 #include <algorithm>
 #include <initializer_list>
 #include <type_traits>