tree f55a4e8b9f47ba950144ed2d9f191320dbf11040
parent 6fb1afce501816c78be17da9f8e2db2f6a5344ee
parent d6ab738ff08636e0a8481f2d4dcf2a02184c2837
author Junyu Lai <junyulai@google.com> 1561011586 -0700
committer android-build-merger <android-build-merger@google.com> 1561011586 -0700

[automerger skipped] Correct value of supported keepalive count for cellular am: a248130fc9 -s ours
am: d6ab738ff0 -s ours
am skip reason: change_id Ia3761f2e78d54866bb2e156d58004396bbc8adc3 with SHA1 c0de2838e7 is in history

Change-Id: I9caaa1a09ecc37735ef741e5ce43f42fa9a779e5