tree 4d25e164440f74b518a137878002d5420db94f77
parent 344ea259afe60d798365adf1563ddc7c62876521
parent d3bffc7904a4b9cbed7969d3e33e2402a9f88373
author Dan Willemsen <dwillemsen@google.com> 1507001571 +0000
committer android-build-merger <android-build-merger@google.com> 1507001571 +0000

Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]" am: 7ecbb7ccdd am: ebd1125140
am: d3bffc7904

Change-Id: Ia91d00ba00761a0390e13b0178edb1d64ae82aa7