diff options
| author | Baligh Uddin <baligh@google.com> | 2017-08-22 14:47:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-22 14:47:58 +0000 |
| commit | d438caf49835068ebca7aa1b58440762e408f220 (patch) | |
| tree | 2ffbca26a4fcbd153da82e4de95f345dc3e94888 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e8262b23fa917fc6fd46c5be40c4f021c2b57fd1 (diff) | |
| parent | e74f52d257a10acc408c10fe9cc2a82d9f135029 (diff) | |
Merge "DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" am: 230c78cec5 -s ours am: f564bcc159 -s ours am: 207ba93a37 -s ours" into oc-mr1-dev-plus-aosp
am: e74f52d257 -s ours
Change-Id: I59072d11b99d74f318f46dfb8e46891830424c58
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions