diff options
| author | Pavlin Radoslavov <pavlin@google.com> | 2016-05-25 01:52:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 01:52:12 +0000 |
| commit | 7691bcfb63b511d8df8144a9a2df038a1413a1af (patch) | |
| tree | 045e4655f4566f3d5ec682ed7c86d9ed9feae925 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 350c0998f58581f6fc2ee782e213b2c5e5636e16 (diff) | |
| parent | 152ce74448aaf26ec05c4918ac634ed29a1675fa (diff) | |
Merge "resolve merge conflicts of e1a6098 to nyc-dev-plus-aosp" into nyc-dev-plus-aosp
am: 152ce74448
* commit '152ce74448aaf26ec05c4918ac634ed29a1675fa':
Reduced the impact of "synchronized" statements
Change-Id: I8ef7609dd1fa8c29ccf1dd55bd8ba7f18cdb5764
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions