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

author Jeff Sharkey <jsharkey@android.com>

Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)
author Jeff Sharkey <jsharkey@android.com>
Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)
diff --cc cmds/installd/InstalldNativeService.cpp
Simple merge
author	Jeff Sharkey <jsharkey@android.com>
	Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 26 Jan 2017 17:48:38 +0000 (17:48 +0000)