tree a7eba6b8bcbb2df59b9a438cac88ca65cd922ef4
parent b786846f6477c1e769bfa93564df559fbd32cd36
parent 8d824a778619e6253aff85e05a99545b5798f58e
author Jack Yu <jackyu@google.com> 1553127515 -0700
committer android-build-merger <android-build-merger@google.com> 1553127515 -0700

[automerger skipped] Merge "API review feedback changes" am: 84ea11384d am: 6c1815ac79
am: 8d824a7786 -s ours
am skip reason: change_id I3c2d406fed3ddaf62dee193c7657caf8c5bc13d2 with SHA1 20d71403b8 is in history

Change-Id: I794dd67b81d909d713b2a82f23b209e294dd8ba2