tree 57471fe4bce59518075b20cb5a62714c7b5cb9a5
parent 6530a11e814e9833b505350d2d0bfc08ab92a847
parent 86e04cb37007b527e79ab5aebf0ffdad3a4ff347
author Hugo Benichi <hugobenichi@google.com> 1502178821 +0000
committer android-build-merger <android-build-merger@google.com> 1502178821 +0000

Merge "Connectivity OWNERS: let owners modify Android.mk" am: 05be68698b am: a22fbf4534 am: db554dfdfa
am: 86e04cb370

Change-Id: I6366148e3da573aa95e5b8e3016eab55e56efe23