tree 356835e57e3e37e959ff951efe07604282a1a757
parent 2b310bbf73d178ebe4e1330addb4771c4a005a2d
parent d42fb78b9b5c2d42ab490df16c76c226d91040c8
author linyuh <linyuh@google.com> 1519845861 +0000
committer android-build-merger <android-build-merger@google.com> 1519845861 +0000

Merge "Group info needed to show a block/report spam dialog into a proto to avoid long method signatures."
am: d42fb78b9b

Change-Id: Ie88d5a75a7d86539aa1bf8504e9d0ceff87a0843