tree d43abefd2f7ddb5abe5ffea791b1b21a90571a93
parent b640267dd1590a32c5edc0ad40b6d4ddecf70ff7
parent 0f08cf28bd18c837f7deed1f2a1709de791226a0
author Jeff Sharkey <jsharkey@android.com> 1485452735 +0000
committer android-build-merger <android-build-merger@google.com> 1485452735 +0000

Merge "Fix two bugs in external storage accounting." am: d1361ceb0c am: e4dc5d4ec5
am: 0f08cf28bd

Change-Id: Ib784b3bbeb49c56b0f2f2b180c04fc6bec14e68b