[automerger skipped] Split client and server impl am: a6d6fa3d9d am: ce9a6c1587 -s ours
am skip reason: Change-Id Ie142b19a5c435a0b4252ffd297504bde69eb44b0 with SHA-1 a6d6fa3d9d is in history
Change-Id: If693b5cf334c52bd56fdf71ad0ac18b51fc8600e
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
index 1e2f3ad..5e4bf27 100644
--- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleClient.h
@@ -20,11 +20,7 @@
#include <android/hardware/automotive/vehicle/2.0/types.h>
-namespace android {
-namespace hardware {
-namespace automotive {
-namespace vehicle {
-namespace V2_0 {
+namespace android::hardware::automotive::vehicle::V2_0 {
/**
* Vehicle HAL talks to the vehicle through a client, instead of accessing
@@ -66,8 +62,4 @@
}
};
-} // namespace V2_0
-} // namespace vehicle
-} // namespace automotive
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::automotive::vehicle::V2_0
diff --git a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
index 27ebbee..ba9799a 100644
--- a/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
+++ b/automotive/vehicle/2.0/default/common/include/vhal_v2_0/VehicleServer.h
@@ -20,11 +20,7 @@
#include <android/hardware/automotive/vehicle/2.0/types.h>
-namespace android {
-namespace hardware {
-namespace automotive {
-namespace vehicle {
-namespace V2_0 {
+namespace android::hardware::automotive::vehicle::V2_0 {
/**
* Server lives on the vehicle side to talk to Android HAL.
@@ -69,8 +65,4 @@
#endif // __ANDROID__
};
-} // namespace V2_0
-} // namespace vehicle
-} // namespace automotive
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::automotive::vehicle::V2_0