diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-03 20:11:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-03 20:11:24 +0000 |
commit | 445ea412ab7338c44379365e862e2d8007521fea (patch) | |
tree | 51cb1c096605b0a05b5afbdb7f59bc50b79b6a02 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 1867ddfa83b32ec9bdd24e3bb1b9f0df56c0b7a1 (diff) | |
parent | 14b978476c0d9daac5063c226e82c4af0cb16a34 (diff) |
Merge "Set calling user as intent extra to indicate intent resolver edge case" into rvc-dev am: c235831ae5 am: c6abcbab14 am: 14b978476c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689273
Change-Id: I244187660c73de4705ad311fe796e6d3ddef779a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions