diff options
| author | Tri Vo <trong@google.com> | 2017-09-23 09:06:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-23 09:06:03 +0000 |
| commit | 9643e7edbb185d601f8a17d045cab452666ff099 (patch) | |
| tree | 4e4441205014d25b49e6aed0f8c6c798bed2e5f7 /broadcastradio | |
| parent | e1882c9d88ab9544181e6c476c23de0ca8457833 (diff) | |
| parent | 2fb33cfc89c1e7b2909b591b5fcf18d86c284196 (diff) | |
| download | platform_test_vts-testcase_hal-9643e7edbb185d601f8a17d045cab452666ff099.tar.gz platform_test_vts-testcase_hal-9643e7edbb185d601f8a17d045cab452666ff099.tar.bz2 platform_test_vts-testcase_hal-9643e7edbb185d601f8a17d045cab452666ff099.zip | |
resolve merge conflicts of 1f3ea1d to oc-mr1-dev-plus-aosp
am: 2fb33cfc89
Change-Id: I127e791456c0d7fda7d70ecafab807bca68481b8
Diffstat (limited to 'broadcastradio')
| -rw-r--r-- | broadcastradio/Android.bp | 2 | ||||
| -rw-r--r-- | broadcastradio/V1_0/Android.bp | 2 | ||||
| -rw-r--r-- | broadcastradio/V1_0/build/Android.bp | 2 | ||||
| -rw-r--r-- | broadcastradio/V1_1/Android.bp | 2 | ||||
| -rw-r--r-- | broadcastradio/V1_1/build/Android.bp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/broadcastradio/Android.bp b/broadcastradio/Android.bp index 2e98897e..6af85153 100644 --- a/broadcastradio/Android.bp +++ b/broadcastradio/Android.bp @@ -1,5 +1,5 @@ // This file was auto-generated. Do not edit manually. -// Use test/vts-testcase/hal/update_makefiles.py to generate this file. +// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file. subdirs = [ "V1_0", diff --git a/broadcastradio/V1_0/Android.bp b/broadcastradio/V1_0/Android.bp index 995dd5b0..de775f25 100644 --- a/broadcastradio/V1_0/Android.bp +++ b/broadcastradio/V1_0/Android.bp @@ -1,5 +1,5 @@ // This file was auto-generated. Do not edit manually. -// Use test/vts-testcase/hal/update_makefiles.py to generate this file. +// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file. subdirs = [ "*", diff --git a/broadcastradio/V1_0/build/Android.bp b/broadcastradio/V1_0/build/Android.bp index d278590b..55d9f471 100644 --- a/broadcastradio/V1_0/build/Android.bp +++ b/broadcastradio/V1_0/build/Android.bp @@ -1,5 +1,5 @@ // This file was auto-generated. Do not edit manually. -// Use test/vts-testcase/hal/update_makefiles.py to generate this file. +// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file. // Generate .vts spec files. hal2vts { diff --git a/broadcastradio/V1_1/Android.bp b/broadcastradio/V1_1/Android.bp index 995dd5b0..de775f25 100644 --- a/broadcastradio/V1_1/Android.bp +++ b/broadcastradio/V1_1/Android.bp @@ -1,5 +1,5 @@ // This file was auto-generated. Do not edit manually. -// Use test/vts-testcase/hal/update_makefiles.py to generate this file. +// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file. subdirs = [ "*", diff --git a/broadcastradio/V1_1/build/Android.bp b/broadcastradio/V1_1/build/Android.bp index dd8b7bce..a75b62e9 100644 --- a/broadcastradio/V1_1/build/Android.bp +++ b/broadcastradio/V1_1/build/Android.bp @@ -1,5 +1,5 @@ // This file was auto-generated. Do not edit manually. -// Use test/vts-testcase/hal/update_makefiles.py to generate this file. +// Use test/vts-testcase/hal/script/update_makefiles.py to generate this file. // Generate .vts spec files. hal2vts { |