tree 52348e1bcfe516c5f2c598ca4ecf7ddc56307c1f
parent 827c77e12d2423db449a35a6e439ec0203a1614e
parent dccd7541debb56332b4162117c1bd5b10907fd3d
author I-Jui (Ray) Sung <ijsung@google.com> 1488565766 +0000
committer android-build-merger <android-build-merger@google.com> 1488565766 +0000

Merge "Handle global allocations for 64-bit targets" am: 636006e2ae
am: dccd7541de

Change-Id: I48ae16a0a41ab6b45fcbacb7097e94a4fca6ddd2