tree 27810521dcdfb92826b023aba3e88721fe7a3ac8
parent 0c26ec1466c982e482dd9240fd302de5ac7ee1b8
parent 1c0655453d876a68728367c665805d39d61c56e4
author Lev Proleev <levp@google.com> 1542047487 -0800
committer android-build-merger <android-build-merger@google.com> 1542047487 -0800

[automerger skipped] Add int16_t to MixedTyped am: ed7ce7afdf am: 4f936dfa4f
am: 1c0655453d  -s ours

Change-Id: I83b52e1a9d2174b5f7478a75318036eea2ad35f4