tree 61ff021f8197bd1ea1b16f6568e7dee890d94aaa
parent 0d29cf99f779e90cd5733d476f8820922c51e820
parent 9b544fb083cd28c792fee2c11337384cfd0a4cdb
author sqian <shuoq@google.com> 1516851892 +0000
committer android-build-merger <android-build-merger@google.com> 1516851892 +0000

Merge "Add None into cancelPendingUssd" into oreo-vts-dev am: 4ccc3b0140 am: efebbbeeea am: e7da333a91
am: 9b544fb083

Change-Id: I9b54f0d11f9150f22ad79daaa4b32b551ee1e763