tree 40e9d1463541842c6e5cecb74f4da05d4130f15e
parent 7a2497c1d0e773e66d578a74ea57f20ab688f350
parent d0867fb8760ba8aba74213a006c10c54ea7fa648
author Erik Kline <ek@google.com> 1485156388 +0000
committer android-build-merger <android-build-merger@google.com> 1485156388 +0000

Merge "More concisely export whether we have a "tetherable configuration"" am: 1b2a1b911d am: 72c17a7234
am: d0867fb876

Change-Id: Iba07ae91906fa2f0763dae831f56b4841572e1f1