diff options
| author | Xiangyu/Malcolm Chen <refuhoo@google.com> | 2019-12-05 00:29:40 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-12-05 00:29:40 -0800 |
| commit | 272f03bdf2759ee82b7ed4c2c9f7c52d7b6b17d4 (patch) | |
| tree | fdb1efff1eca5d714d4f166b5e722c8b755f0c17 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 223335a41f6a9e65b4d1ce0dedac6aba92287ed9 (diff) | |
| parent | 603d7e7d8995c05e4e983e13464a94aaa13dd9df (diff) | |
[automerger skipped] Merge "Add System API to indicate whether physical SIM can be disabled." am: 454c0659a6 am: 0b2531862f
am: 603d7e7d89 -s ours
am skip reason: change_id I764f344b0d430cb49ccccc9f402139ea32e70c92 with SHA1 c5dedead28 is in history
Change-Id: I1fbaf6919700013c7e84ae66996b33be903ae4fc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions