OSDN Git Service

resolved conflicts for merge of 8cee6587 to mnc-dr-dev
authorIan Pedowitz <ijpedowitz@google.com>
Tue, 14 Jul 2015 05:50:34 +0000 (22:50 -0700)
committerIan Pedowitz <ijpedowitz@google.com>
Tue, 14 Jul 2015 05:58:29 +0000 (22:58 -0700)
commitd7be214ca469c593d8a59cf7404020f4ad1aaed9
treeee0698ad253b11a9204f2baca3e72882fdd7bdb8
parentc5eadf8d889b7e8901d647502d22a0d0c108d1da
parent8cee6587e0efb2d8e63f1505b057a1e328525017
resolved conflicts for merge of 8cee6587 to mnc-dr-dev

Change-Id: I0b2ed52214bb097d7fd69434afd0c6c890b5afb3
core/java/android/os/storage/IMountService.java
core/java/android/os/storage/StorageManager.java
services/core/java/com/android/server/MountService.java
services/core/java/com/android/server/pm/PackageManagerService.java