diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 23:54:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-15 23:54:58 +0000 |
| commit | 03b8c3c7aa298dcdcf03cb5c8bae4e197b9671be (patch) | |
| tree | cd68e80e50587f1968a6dbd5b467916e95f0a6f9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 479b063957275e7d4c72656d783a7fb705d7bf03 (diff) | |
| parent | 9160083bca318193cabf25a937c31211d5078760 (diff) | |
Merge changes from topic "am-19932f510ce54a2080891a80ee47849b" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: bb8541322e am: d69ac21c67
DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: e2c8878455 am: 8f581abc1c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions