tree 2a0d4ea8cc0f61ac9bfe6429a9ec937d636a5d8d
parent 826a63b957af9cfea3d06a0f2869255e209d4398
parent 648327c3084455b2976ffee0513f4314bbaf9117
author Marco Nelissen <marcone@google.com> 1563395653 -0700
committer android-build-merger <android-build-merger@google.com> 1563395653 -0700

[automerger skipped] Merge "cmds/service: Fix categoryCount" am: c4d2f8aea7 -s ours
am: 648327c308 -s ours
am skip reason: change_id Ie592a02c5baa1eb5527ddd8d726e3b1181d937fd with SHA1 cc5f51751b is in history

Change-Id: I4a140c5af75765a5fe84e02640b6dcc3a009ac29