Merge changes from topic "lazy-cas"
am: 7f8e9fdc8d
Change-Id: I4efb2b4e461995ab3b6c862a3f4428995fcb1652
diff --git a/transport/include/hidl/LegacySupport.h b/transport/include/hidl/LegacySupport.h
index 573a793..d5b3ddb 100644
--- a/transport/include/hidl/LegacySupport.h
+++ b/transport/include/hidl/LegacySupport.h
@@ -96,7 +96,7 @@
*
* If this function is called multiple times to register different services, then this process will
* only exit once all services have 0 clients. This function does not know about clients registered
- * through registerPassthroughServiceImplementation, so if that function is used in conjuction with
+ * through registerPassthroughServiceImplementation, so if that function is used in conjunction with
* this one, the process may exit while a client is still using the HAL.
*/
template <class Interface>