diff options
author | Bryce Lee <brycelee@google.com> | 2018-05-11 11:50:37 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-11 11:50:37 -0700 |
commit | c540562cfa7446154654e844ee85e09dd0596a03 (patch) | |
tree | 2883766263a1524f7cb6925969840bed0705f90c /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 7334dcad1f0fdf736704ae9809d0a7b36ab9537a (diff) | |
parent | 356759d65904b3fc31460aa2ec6aa721dadc0c8f (diff) |
Merge "Don't allow non-showOnLock activity to be next on finish." into pi-dev am: 92a339736f
am: 356759d659
Change-Id: I83d249a1a6f56d95e53179ae030449827aedf44c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions