tree 0ed55b9a449fcd8396ecc195f12118db3adabefc
parent fce635951d0e5f1d9c361e405c8258fb41ed91aa
parent 2f3380574eaf140c22603d061d5576e8a874b33e
author Dan Willemsen <dwillemsen@google.com> 1506999153 +0000
committer android-build-merger <android-build-merger@google.com> 1506999153 +0000

Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 2f3380574e

Change-Id: I5dfaf7f7e287aa00c35928852ee3461396861cfd