tree 7d62a0fb06b8dc296f38b5ac1979cc367ccde4f0
parent 19c96b49b53c7a215159e3599b44b2e10697f832
parent 973d5aeb1778edefca4e15cbfa24771a3632d61d
author Jeff Sharkey <jsharkey@android.com> 1484863609 +0000
committer android-build-merger <android-build-merger@google.com> 1484863609 +0000

Merge "Measure external storage using new GIDs." am: f5a21ba425
am: 973d5aeb17

Change-Id: If3e585b5a35faa1f0151351affa23b382976dc4a