OSDN Git Service

Merge changes Ic95d219b,I58d82cbc
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 18 Jan 2018 19:54:09 +0000 (19:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jan 2018 19:54:09 +0000 (19:54 +0000)
commitbe090e9fe9aafce445250104aba24fdca9be1950
tree0df234619c7fff5d9f2755781440279088a3218e
parente1bb0c2f4c2599378a297df5570d8ca91ced7023
parentcf6d84109b73e8595ca43e41ac8a18d8317b4cdc
Merge changes Ic95d219b,I58d82cbc

* changes:
  Don't add any trust agents if the controller is not available.
  Introduce boolean flags to show/hide items in Security & location.