tree 6479d0820dfc3bd33ae13f50e40ea578772c54e9
parent 131ffc4b9239af5306568796986b86b3cffbabd3
parent 9bf9e54f9a795f23616419da59a8a7c79c714203
author Jordan Liu <jminjie@google.com> 1549056076 -0800
committer android-build-merger <android-build-merger@google.com> 1549056076 -0800

[automerger skipped] Merge "Refresh cardId before using it." am: 84d250c18d am: 5b3acb8d9b
am: 9bf9e54f9a -s ours
am skip reason: change_id I30d70b839f05183ad201a114ea12c79c730f4206 with SHA1 b94f8d3fb3 is in history

Change-Id: I207cb6897bb39f93ab0f00b158ce71b7718fa4d3