diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-15 23:36:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-15 23:36:30 +0000 |
| commit | 38e01b3d3aa18ace98b22721d6b215f10a778f0f (patch) | |
| tree | a7778aeb00e30e9e4292074add2fe86f185da2a4 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | d69ac21c67cd884001ef0f769ba507f5b00f6271 (diff) | |
| parent | 9b1cd0daec1886c6425577f26d2c6412250f420b (diff) | |
Merge changes from topic "am-47da99b99c4047c98fbfc33f939b5089" into rvc-d1-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: 699f5b0d50
DO NOT MERGE: Always return non null from getGpsStatus am: d9df33d1c0 am: 5cda502532
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions