tree d061d1419d3b0b6d86fe45c3022ab5de088d7716
parent 6fd5aa6533ffb290e4ae19da31020525c82b49a6
parent 08e5c07d2c9e0a0354783141de77b83cf62c94b8
author Nicolas Geoffray <ngeoffray@google.com> 1465474808 +0000
committer android-build-merger <android-build-merger@google.com> 1465474808 +0000

Merge \"Fix FOUR_ARG_DOWNCALL assembly stubs on arm and x86.\" into nyc-dev
am: 08e5c07d2c

Change-Id: I6f2687374291c9a3be757551b222f6386fb4ac4e