diff options
| author | Dave Mankoff <mankoff@google.com> | 2019-07-27 04:58:25 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-27 04:58:25 -0700 |
| commit | ece6c47e7a6b09dcd538ec2e2d9595ae64acf82d (patch) | |
| tree | 895be70ea99194307bc24e0de3ea15a60f232508 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 3d624e4ed4f2e79fa72b0f518dcf6c2677d1260d (diff) | |
| parent | cc87595ed557034c3d7217249b8e20d2a1ee3b88 (diff) | |
[automerger skipped] Merge "Do not allow the FalsingManager sesion to start when AOD is showing." into qt-dev am: 000415be6e
am: cc87595ed5 -s ours
am skip reason: change_id I6d14db66d53a668b7cf8dd15ebb489fb3ebf4c7c with SHA1 622eeaf0d5 is in history
Change-Id: I349447d1e01deb9127a592f792f14b7633792919
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions