tree e934abf06cdd2c3288c4f3870e3557b3fcdb4c3a
parent dd52ade28ccb8c429260dfb658717f3e9d2f94f2
parent 62d118a444ddefa1b93829d23cec64d042664c39
author Chih-hung Hsieh <chh@google.com> 1534353254 -0700
committer android-build-merger <android-build-merger@google.com> 1534353254 -0700

Merge "Replace short with int16_t." am: 34affaed9c
am: 62d118a444

Change-Id: I888f0ea075e941da3498dad724fb518a9e2cd355