diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-21 22:11:17 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-21 22:11:17 +0000 |
| commit | e74f52d257a10acc408c10fe9cc2a82d9f135029 (patch) | |
| tree | 5b6d9c39d06b7de9cae8e8cb7d3376619548f5b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 021163f64c4c406bb446e4d1efcb7dab111d9098 (diff) | |
| parent | 9868e10b5b4e210e97fb2c9f29f05cd0111d1f46 (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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions