tree 19350ced934907e1d377ac5da12147192df42542
parent d614cd35099ad886e2812b6de13b45989030e048
parent ad3fd82f8b816ec63f704476d84bd728df381099
author Erik Kline <ek@google.com> 1497000217 +0000
committer android-build-merger <android-build-merger@google.com> 1497000217 +0000

Merge "Convert IControlsTethering from interface into callback" am: 5b9d362b60
am: ad3fd82f8b

Change-Id: Ib1f41df1200378191c0722a280939ccbde539920