diff options
| author | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-08-13 08:57:01 -0700 |
|---|---|---|
| committer | Tuan Nguyen <tuan.nguyen617@gmail.com> | 2019-08-13 08:57:01 -0700 |
| commit | 879478744460b4593db4c0763524262faca67901 (patch) | |
| tree | 5f7a88efbf9ed490fdc5674bbaee909bea7dee51 /android/sdl_android/src/androidTest/assets | |
| parent | 3ede8b30e9c0311db6369adaf3035717012fd568 (diff) | |
| parent | 5ea3f89124f070f8bf9a97eeb70854ee140f23f5 (diff) | |
| download | sdl_android-879478744460b4593db4c0763524262faca67901.tar.gz | |
Merge branch 'develop_mainRepo' into multipleModule
# Conflicts:
# android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
# base/src/main/java/com/smartdevicelink/protocol/enums/FunctionID.java
Pull in develop and resolve conflicts.
Diffstat (limited to 'android/sdl_android/src/androidTest/assets')
| -rw-r--r-- | android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json b/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json new file mode 100644 index 000000000..8870423de --- /dev/null +++ b/android/sdl_android/src/androidTest/assets/json/ShowAppMenu.json @@ -0,0 +1,13 @@ +{ + "request":{ + "name":"ShowAppMenu", + "correlationID":187, + "parameters":{ + "menuID":100 + } + }, + "response":{ + "name":"ShowAppMenuResponse", + "correlationID":188 + } +}
\ No newline at end of file |