diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-16 00:06:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-16 00:06:27 +0000 |
commit | a5bf2945a71060f09f22924fccf2e523c6d3d298 (patch) | |
tree | 5b81d79d162019ff0a985cc5956fd773e674a4bf /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 7a1893849529a9f7f59614acad61c2656d2836f3 (diff) | |
parent | 9160083bca318193cabf25a937c31211d5078760 (diff) |
[automerger skipped] Merge "DO NOT MERGE: Always return non null from getGpsStatus" into rvc-dev am: 1b09322bc6 am: bb8541322e am: d69ac21c67 am: 9160083bca -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12160606
Change-Id: Ie32b4fc3abbe2bfcac156aba240fa9f0e932fd1c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions