summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorNate Myren <ntmyren@google.com>2020-05-05 21:05:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-05-05 21:05:28 +0000
commit24a6cb4916e64e9c63488f7784d9ddebba9ff129 (patch)
tree02b1bdf8cbc5d7a252c20eb3f34d16bce4a749d5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent416fb9f05657cfa03d1ccff6a05c367f694c6c72 (diff)
parent78aee8af6de60579f6c5b2ffe3e225defde96a04 (diff)
Merge "Revert "Disable READ_PHONE_STATE fix for beta 1"" into rvc-dev am: 79b319e142 am: 78aee8af6d
Change-Id: Ie82744f9ba219d531481c8142f773a5084119905
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions