tree 82099f1b0579898fe265c1b3af45fd6a0a35ede6
parent 26c35bc52a120b07f5f248525ee07842d86d0c9d
parent bf28a55d0cfab36db0f057bd4886b90ab58f0d74
author Marco Nelissen <marcone@google.com> 1563396176 -0700
committer android-build-merger <android-build-merger@google.com> 1563396176 -0700

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

Change-Id: I349345417881d8fdea10c83c23b76876939a0342