diff options
| author | Winson Chung <winsonc@google.com> | 2017-07-25 15:56:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-25 15:56:25 +0000 |
| commit | b23ad33d58a326142dd4e6fa22b2284774fb866b (patch) | |
| tree | 9c82290bb92274cb38ab01891c2e7d2bd5b12b55 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cf3496a2474e39e1c49762b3c913b7151f356ef2 (diff) | |
| parent | f1f25ad5f294ec0ccbec0a7d4346ec7acefa1123 (diff) | |
Merge "Disregard closing activities when blocking previous activities." into oc-dr1-dev
am: f1f25ad5f2
Change-Id: Idc05690e4201c5b379f41d2f78e951556dd96fc5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions