From: Dimitry Ivanov <dimitry@google.com>
Date: Mon, 14 Dec 2015 21:37:54 +0000 (-0800)
Subject: Merge "Temporary disable linker-namespaces" am: a8be6ae6fc
X-Git-Tag: android-x86-7.1-r1~846^2~130
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f54026d329693841810439f062de0dcf7ef4a5c;p=android-x86%2Fart.git

Merge "Temporary disable linker-namespaces" am: a8be6ae6fc
am: 861e58d1c5

* commit '861e58d1c5eeac5bfa97765c93f20649f916bde8':
  Temporary disable linker-namespaces
---

1f54026d329693841810439f062de0dcf7ef4a5c