tree 20a84da370f13aa07f037f143228455e1d19cb47
parent 9de682747987babc7692760844b3161ce4b2d5df
parent dee194df54fd19feafd2464f4d86aaded67171a4
author Dan Albert <danalbert@google.com> 1469722811 +0000
committer android-build-merger <android-build-merger@google.com> 1469722811 +0000

Merge changes from topic \\\\'soong-sysroots\\\\' am: 65de8e446c am: 01efd46bca am: cce7b4f00a
am: dee194df54

Change-Id: I836ba1c1734f09df3645345ff7a8e9b7fdcac3a5