tree b430545a79459270127f90247249d4552797fe65
parent 450d0058068a4a245bb0a189db780f4ffcf84bdc
parent a102698fb4103c384fcb7457eebceefc8fb8b342
author Chih-Hung Hsieh <chh@google.com> 1473900638 +0000
committer android-build-merger <android-build-merger@google.com> 1473900638 +0000

Merge "Fix arm64 inline assembly code typo." am: 04bcf552a2 am: 2e71f4d68e
am: a102698fb4

Change-Id: I8307a0d807cca351c3604120b5d884f6381cd296