diff options
| author | Malcolm Chen <refuhoo@google.com> | 2019-11-25 13:46:07 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-25 13:46:07 -0800 |
| commit | d053453b1fde3334033dc05bed6a42f7c11b8567 (patch) | |
| tree | f7171ee9e6c09d72235c69f2ad2d459116247fac /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7e5a2369849c869abf4e39a4ec1670b181f14cf9 (diff) | |
| parent | eb7ac68dffb202bc2d336bdba42747b923ae6afb (diff) | |
[automerger skipped] Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321 am: a575fdfc31
am: eb7ac68dff -s ours
am skip reason: change_id Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd with SHA1 b908f9c5f9 is in history
Change-Id: I1a9df917aa7cb9afbac4c2b399a4c7e4f25037c8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions