diff options
| author | Sarah Chin <sarahchin@google.com> | 2020-12-17 07:21:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-17 07:21:39 +0000 |
| commit | 1df823aaf9747eaaaab324e6a6760a8ef3fd4bf6 (patch) | |
| tree | e9bc66309e1bebe35a0cb8bcf6e74ba792577c7c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 82f859838f414677154dd41e2b345195d0ded150 (diff) | |
| parent | aa95da1e19db7bc89bc581b1ba46bd0b63b20aaf (diff) | |
Merge "Move phone ID to extra for action provision" am: fee0474f55 am: aa95da1e19
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1530760
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0aaf794caca7c3be0731a2ed7774ec181ffd108a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions