tree c46d49caf8c80cf30283b6731dd65a30c639bab6
parent 955f3424a2c327b17b89c7a17406f968447ae31d
parent 5f848242a1c032a32b0c46db87b503066c37ced9
author Holly Jiuyu Sun <jiuyu@google.com> 1547516801 -0800
committer android-build-merger <android-build-merger@google.com> 1547516801 -0800

[automerger skipped] Merge "Fix typo according to API review." am: c83e37317f am: 8585a4556c
am: 5f848242a1 -s ours
am skip reason: change_id I4c1cc7badf3646e970272a663922a0ae98988cab with SHA1 1c7bd090c9 is in history

Change-Id: Ic2f289bddf89d96980912556c83491f8d8176d70