OSDN Git Service

resolved conflicts for merge of d26707da to master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 12 Jan 2010 19:53:42 +0000 (11:53 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 12 Jan 2010 19:53:42 +0000 (11:53 -0800)
commitfa101530bc74bdf1517a1840a9415249211b9414
treef0c93712359e7b102a1ed5edd2fb81a7f6ecb374
parent8f028a94fc533e75077485a7d11a04e4de820335
parentd26707da8965bffb63c55d729f19ddfcb83044b3
resolved conflicts for merge of d26707da to master

Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
core/java/android/os/IMountService.aidl
services/java/com/android/server/MountService.java