tree a9d1ef6085988e33a8d53d32e22adc7afc889033
parent 9020d5ed4bc954fe7446552038ea10f7e28bc505
parent 1a323e5268f1a0c647db8e1a96c486f9aeecc1dd
author Dan Willemsen <dwillemsen@google.com> 1506998612 +0000
committer android-build-merger <android-build-merger@google.com> 1506998612 +0000

Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 1a323e5268

Change-Id: I90dee38cddaa1becbcc7dcfe91d7ecd09e22dcdd