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