tree c79df42c535742902caebe566bda653c28a71e70
parent 535acfe27087b08c39e0d798d130152e04c6fd26
parent 04e60a738ca04c3e2520f1929ec1b678d514065d
author Miao Wang <miaowang@google.com> 1464048942 +0000
committer android-build-merger <android-build-merger@google.com> 1464048942 +0000

Merge "Merge "Add x86_64 linker to Build-Tools for RenderScript." into nyc-dev am: afdc158c77 am: 89a08013ac" into nyc-mr1-dev-plus-aosp
am: 04e60a738c

* commit '04e60a738ca04c3e2520f1929ec1b678d514065d':

Change-Id: I006ca18b4bf65b483ab5a79a7b6cb91d148defe6