Snap for 6877830 from c6279e344094e4fc1d378cdf69e0bdce54747500 to sdk-releasesdk-release

Change-Id: If272b59dec34379ba97233388d3544673f4bef32

4 files changed, 4 insertions, 4 deletions

diff --git a/UID/AndroidManifest.xml b/UID/AndroidManifest.xml
index 9dc2680..73233eb 100644
--- a/UID/AndroidManifest.xml
+++ b/UID/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
-        <!-- Dummy activity -->
+        <!-- Test activity -->
         <activity
             android:name="com.android.tests.connectivity.uid.ConnectivityTestActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/sl4n/facades/bluetooth/bt_binder_facade.h b/sl4n/facades/bluetooth/bt_binder_facade.h
index e06cd75..65ece71 100644
--- a/sl4n/facades/bluetooth/bt_binder_facade.h
+++ b/sl4n/facades/bluetooth/bt_binder_facade.h
@@ -26,7 +26,7 @@
 // representing the pass/fail value of the function. The functions check to see
 // if the API call is actually possible. If it is the function's tuple will
 // contain the actual result and an integer that indicates the value passed. If
-// the function is not possible then there will be a dummy return value in the
+// the function is not possible then there will be a mock return value in the
 // first position of the tuple and the second value in the tuple indicates the
 // value failed. Therefore it is up to the function to decide whether the
 // expected api call is actually possible before calling it.
diff --git a/sl4n/facades/wifi/wifi_facade.h b/sl4n/facades/wifi/wifi_facade.h
index c028c5b..c68771b 100644
--- a/sl4n/facades/wifi/wifi_facade.h
+++ b/sl4n/facades/wifi/wifi_facade.h
@@ -22,7 +22,7 @@
 // WifiFacade provides simple wrappers to call Wi-Fi HAL APIs.
 //
 // Each public function returns a tuple: <result, code>, where:
-//     result: result of HAL API or a dummy value (of the correct type)
+//     result: result of HAL API or a mock value (of the correct type)
 //             on failure.
 //     code: sl4n_error_codes::kPassInt or sl4n_error_codes::kFailInt on
 //           success or failure respectively.
diff --git a/sl4n/rapidjson/doc/stream.md b/sl4n/rapidjson/doc/stream.md
index 7b3c5ca..e70f52a 100644
--- a/sl4n/rapidjson/doc/stream.md
+++ b/sl4n/rapidjson/doc/stream.md
@@ -273,7 +273,7 @@ concept Stream {
 
 For input stream, they must implement `Peek()`, `Take()` and `Tell()`.
 For output stream, they must implement `Put()` and `Flush()`. 
-There are two special interface, `PutBegin()` and `PutEnd()`, which are only for *in situ* parsing. Normal streams do not implement them. However, if the interface is not needed for a particular stream, it is still need to a dummy implementation, otherwise will generate compilation error.
+There are two special interface, `PutBegin()` and `PutEnd()`, which are only for *in situ* parsing. Normal streams do not implement them. However, if the interface is not needed for a particular stream, it is still need to a placeholder implementation, otherwise will generate compilation error.
 
 ## Example: istream wrapper {#ExampleIStreamWrapper}