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