tree 4b6635d846f1b80d2a76e0aeb8505ebac5b16749
parent 3383005724f617ba7d5c708db70b694586f7fe72
parent a3fec76836270210694cd8daf8dec69147ae45cc
author TreeHugger Robot <treehugger-gerrit@google.com> 1550759389 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1550759389 +0000

Merge "Remove STOPSHIP for adding activity recognition icon to permission"