tree 6cae0e5d6a0acc225f1cc583f3688c597f7e9ac5
parent ace41c0aab81f817fe37788d9d5cdf295324e9a4
parent 861e58d1c5eeac5bfa97765c93f20649f916bde8
author Dimitry Ivanov <dimitry@google.com> 1450129074 -0800
committer android-build-merger <android-build-merger@google.com> 1450129074 -0800

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

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