diff options
| author | Christopher Tate <ctate@google.com> | 2018-05-29 15:20:59 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-29 15:20:59 -0700 |
| commit | 96efd907c515f25d5b3db12ab7ec73c2441ee01a (patch) | |
| tree | b0523e6ed81512adea99042e9215f1a927f3fd4a /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | bd14364a06b7fc1e2d2c3dce977206ba4d2f8380 (diff) | |
| parent | 3ec17d31c5eed1730d3ea1e2d03763b03b2b6820 (diff) | |
Merge "Extend startForegroundService() fg transition timeout to 10 seconds" into pi-dev
am: 3ec17d31c5
Change-Id: I9a3a0d8e9fa348018a36c1e306aab822df377aa0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions