tree b9b4ed5057b043778d02e5190f314a7ae784ed11
parent 6d33684ca38f0d759fe0d01561e99377532b0477
parent 281ec3272f8335513bf85f17465f55b241ae0725
author Christopher Wiley <wiley@google.com> 1465419621 +0000
committer android-build-merger <android-build-merger@google.com> 1465419621 +0000

Merge changes from topic \'tethering-ownership\' into nyc-mr1-dev
am: 281ec3272f

Change-Id: Ia8b234bcfdd479ef1ecda6b9102cf7cd5b3f217c