[automerger] Fix Partner.getText am: 466c50ab5c am: 519471d0d1

Change-Id: Ie0fd5f2f2fa33865ee7baa5832a03f91d9b89527
This commit is contained in:
Android Build Merger (Role) 2018-06-13 00:21:57 +00:00
commit 2e0266cf9a

Diff content is not available