tree c2d030054c0a315daaea07f089980b7cf6539f3b
parent d038e1fb4a91eeedd0a308a04ae4f797683b3aa0
parent b5d4ff67d65fd41aa696076da1ec87d9f277492d
author Pengquan Meng <mpq@google.com> 1567813746 -0700
committer android-build-merger <android-build-merger@google.com> 1567813746 -0700

[automerger skipped] Merge "Support maximum wait time for Cell broadcast" into qt-qpr1-dev am: c12bf8a9e0 -s ours
am: b5d4ff67d6 -s ours
am skip reason: change_id If3d8d7915f2d86da20c63e99bee01f30e3ea89c0 with SHA1 9f677a0790 is in history

Change-Id: I0bc3929e71dbbd1f56eb3ea6de36aac088db8f53