diff options
author | Hall Liu <hallliu@google.com> | 2020-03-20 20:56:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-20 20:56:30 +0000 |
commit | d659714abaae23116ccfb1728b1c8efe9d03e42e (patch) | |
tree | eadd26ffd41b7429b7e0fe7346a52ae82b14c810 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | dc828817e5f3fca98e2545e48bf5dec68afe1bd3 (diff) | |
parent | 491fbcaeafba07a76e9e056e4679fcf193376343 (diff) |
[automerger skipped] Merge "DO NOT MERGE Institute limit on PhoneStateListener" into qt-qpr1-dev am: 491fbcaeaf -s ours
am skip reason: subject contains skip directive
Change-Id: I267afc325b31047b2aa2096be1a645be010c0d6d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions