diff options
| author | Xin Li <delphij@google.com> | 2019-07-02 16:07:02 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-02 16:07:02 -0700 |
| commit | 08f3d1a949e7cc828615fc519ef2860faca1411a (patch) | |
| tree | 90bc396d80bf2c65b33abfad5e1bd5844d9f85fc /tests/cpp_api/cppbasic/Android.mk | |
| parent | 5b2ef18ea2975f9cc15ba39c9f85e563feb6ddda (diff) | |
| parent | 29fffa8f14298cbb24ba70a1a1a17b05c74a5bc8 (diff) | |
| download | rs-08f3d1a949e7cc828615fc519ef2860faca1411a.tar.gz | |
[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: da128f2e97
am: 29fffa8f14 -s ours
am skip reason: subject contains skip directive
Change-Id: I676013b77ba2e4d3a72e60aefcc84fe1baaaf969
Diffstat (limited to 'tests/cpp_api/cppbasic/Android.mk')
0 files changed, 0 insertions, 0 deletions