tree 94700a56b4540ddd5739ad23d45cb51477683b20
parent 3c682cabc9b301fc5376dfd7b34d6d45adcf0218
parent 1a816ce119e5bca736f35366b281e9fd8e22c177
author Erik Kline <ek@google.com> 1485156622 +0000
committer android-build-merger <android-build-merger@google.com> 1485156622 +0000

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

Change-Id: I290df5269739bc7fb5ebc8614a96c38bf7faf367