diff options
| author | Pengquan Meng <mpq@google.com> | 2019-09-06 14:49:01 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-09-06 14:49:01 -0700 |
| commit | e99edb8a918ca7e529f7e514aaed557d6a7fd4fa (patch) | |
| tree | 26e885c60f5bde228e51a8f8e0369cf4d73c2edd /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c5728033affdcbc90f477df3a70d0815b470b487 (diff) | |
| parent | 7af3d7f0c01996a756f10354c57444033703647c (diff) | |
[automerger skipped] Merge "Support maximum wait time for Cell broadcast" am: 156f347db4 am: 0362123033 am: 90247580a7
am: 7af3d7f0c0 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 02d6ac0f20 is in history
Change-Id: Ifca1d768fd0b423dbad7193526491da6517e7767
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions