tree 0ca137d684cd169361974de6aac441dfa4b57500
parent 3f4723dce080b20200a935a4cef1ec4824ed8434
parent 53fbfb043c36f42895566eefa916689ee6bb08df
author josephjang <josephjang@google.com> 1594022480 +0800
committer josephjang <josephjang@google.com> 1594022480 +0800

Merge remote-tracking branch 'goog/upstream-master' into josephjang-nos-merge-upstream

* goog/upstream-master:
  Identity: Add two paramter in ICsetAuthTokenRequest

Bug: 160198696
Bug: 160556107
Change-Id: I8c9e9c09153a471bac544a6cfc3bd139bbd5fc77