diff options
author | Anton Hansson <hansson@google.com> | 2020-07-22 16:47:47 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-22 16:47:47 +0000 |
commit | d361e4cd7b9e88b02f668cec92f300bc375275d5 (patch) | |
tree | c1657adbb57c5a278596ddc583a251250f70c0ab /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 14f88702b12a631943a9b7ecfbc657941b6ddea4 (diff) | |
parent | 1dd4f123cf58ba8bfafac05fe758e61222853829 (diff) |
[automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours am: 1dd4f123cf -s ours
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357
Change-Id: I3bd33f57952ef701d77bcabc56674adf1bbc6af8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions