diff options
| author | Adrian Roos <roosa@google.com> | 2016-12-27 23:49:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-27 23:49:53 +0000 |
| commit | 99a921a272e5e80635d930a9cbc2f46d21bb8227 (patch) | |
| tree | 81a4e4f2810c62393519316c5c101cc373d3665d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dff956b0e052f5a1c43d4d0530bf56dd0bd3ac82 (diff) | |
| parent | 02f07cce35103dc096193fb798625cf81dc74fa9 (diff) | |
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am: 02f07cce35
Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions