diff options
| author | Erik Kline <ek@google.com> | 2018-04-03 19:33:34 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-03 19:33:34 -0700 |
| commit | d46f0176c34f517587c75959a21c582567c3162d (patch) | |
| tree | 7ba141f30093cb0d46e8e2aa4f294cd0a69c9c35 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | bdc641a6d5e0d1ab4d99be9a6fb77bced5454e27 (diff) | |
| parent | 2bad006b0d2455f45a262b11865b91acbc943c21 (diff) | |
[automerger skipped] Merge "Support bypassing TLS in the framework" into pi-dev
am: 2bad006b0d -s ours
Change-Id: I5146ae845469b81dc0aec6838d55be4a33c670ad
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions