Commit 261105f5 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "Merge "ART: Change x86 from modify_ldt to set_thread_data" into nyc-dev... 

Merge "Merge "ART: Change x86 from modify_ldt to set_thread_data" into nyc-dev am: ff2d53a1 am: edaba57a" into nyc-mr1-dev-plus-aosp
am: 9e4345f9

* commit '9e4345f9':

Change-Id: I5a8e538c7d049a15930a4b281dd1d187a089fddb
parents ace49ffe 9e4345f9
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment