tree 61268eeae7c5d067cca8678a5c4e1be27c72bbc4
parent e7b416e4ed3338e19a4096b32130ad12b0cdc328
parent 4711f981709aeeb5c33959d3a38fa2dce1c0c460
author Android Build Merger (Role) <android-build-merger@google.com> 1482345856 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1482345862 +0000

Merge changes from topic 'am-caa9190d4d3243e3bd21c7d512d1026a'

* changes:
  Augment diskstats dumpsys to have categorization and apps. am: 090b2d9d6c am: f1312cd68e
  Add a file collector to the platform. am: be770dce08 am: a9d8602787  -s ours
  Merge "Add an app size collector." into nyc-mr2-dev am: 8fd55702b1 am: 9bd20ab6c9
  Add an app size collector. am: c7d9de59bf am: f5e2f1ae38  -s ours