diff options
author | Nate(Qiang) Jiang <qiangjiang@google.com> | 2019-11-12 15:20:56 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-12 15:20:56 -0800 |
commit | c6274feb34e517f59ae25bb5eab7711d1ee03f90 (patch) | |
tree | f95a240cadf5d7c90817f5505252eb2d65a6dc5e /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 549d6140bc041564b43cd60453a1d8ca51a28edc (diff) | |
parent | d76f4079536cae245285bb65603e779353d5c451 (diff) |
[automerger skipped] Merge "[WifiAware] fix creator from parcel" into qt-qpr1-dev am: e3ff000ca5
am: d76f407953 -s ours
am skip reason: change_id Ie0f4954f5ca6cdb0ae1f77bfd4420b75f302c0f3 with SHA1 ee9a5ae15c is in history
Change-Id: I3c5ec1e9a177a15144e7ddeb0caa0a1dadbfb740
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions