tree 1355e843e095115dd042a47ef17f2df55eaf6e6f
parent 46e54ccb87e3ffc386d1c533dfde7614eecbfb02
parent b40dcf9cb6c706c324f43efabc573c8f7a146ae1
author Andreas Gampe <agampe@google.com> 1449708075 +0000
committer android-build-merger <android-build-merger@google.com> 1449708075 +0000

Merge "ART: Make trampoline compiler pointer-size-safe" am: 1d97f949e8
am: b40dcf9cb6

* commit 'b40dcf9cb6c706c324f43efabc573c8f7a146ae1':
  ART: Make trampoline compiler pointer-size-safe