diff options
author | Sarah Chin <sarahchin@google.com> | 2021-02-03 00:38:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 00:38:59 +0000 |
commit | 7e1dd38c3aced299078bf897162e036ae1e90dfd (patch) | |
tree | 95d25f058e7ccc775c723c69cf169f95c99063ff /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f20f52a30488ab14225f8ef4ff38516173d618a4 (diff) | |
parent | 39d4439f73fd59407a4caa39e0c8737624b14344 (diff) |
[automerger skipped] Merge "Temporary fix to prevent TEMPORARILY_NOT_METERED leak" am: 5becb8f399 am: b9938fb47d -s ours am: 39d4439f73 -s ours
am skip reason: Change-Id I2b987d24851cdb16d8457b0ec5c546ace5485ed0 with SHA-1 5d0e3a3404 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571130
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I48c0ad16ece014baea0998094e8146965d50370d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions