OSDN Git Service

Merge "Add ability to override subscriber capabilities." am: d6cd4b241a
authorJeff Sharkey <jsharkey@android.com>
Fri, 19 Jan 2018 01:11:41 +0000 (01:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Jan 2018 01:11:41 +0000 (01:11 +0000)
commit992cfa266797adde3c470331aa07ab111d989cd5
tree0839fcf0d7f6c41e18465e36a58b29caa18d0099
parent4775f0c76e51779462ba460b88dd9a3a32d5fef9
parent5e097d452b37c8bb21a6e4dac62cad750a4b61db
Merge "Add ability to override subscriber capabilities." am: d6cd4b241a
am: 5e097d452b

Change-Id: Ib22d57c7cde75560cfd5bdd71b75d29b1056f783