tree 4cb6bd9ae4ca91aa9cf4e5ce8296fb95e9f81a78
parent 049087b24e52d973e46ad37829460c244a8709ab
parent 1d0c25962f69ad3aac2666126857493d2cda328e
author Siddharth Ray <siddharthr@google.com> 1529957084 -0700
committer android-build-merger <android-build-merger@google.com> 1529957084 -0700

[automerger skipped] Merge "Fix in Modem Activity Info updates" into pi-dev am: 1231b7016e
am: 1d0c25962f  -s ours

Change-Id: I3b28a99183b1273a3c8c83177724df5b56d0e249