tree 6fdde7b091a51583bc4256e68da6fe95bbfa514f
parent 92052f6f8e35886f92b65268e20112c28abac222
parent 7708d0d91d86e02967e70814737e69f7b9f3362e
author Lorenzo Colitti <lorenzo@google.com> 1542376583 -0800
committer android-build-merger <android-build-merger@google.com> 1542376583 -0800

[automerger skipped] Merge changes from topic "sort stats" into pi-dev am: 664145dcbc  -s ours
am: 7708d0d91d  -s ours

Change-Id: Ifb8171b56932ef6b7c70a0ff36ebacc4ee7801db