OSDN Git Service

Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368...
authorJinguang Dong <dongjinguang@huawei.com>
Thu, 6 Jul 2017 04:23:26 +0000 (04:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 04:23:26 +0000 (04:23 +0000)
commitfebf2ad9d7d2c3a4c171b7a766e534601645cf49
tree75b5a0b71405db930c4210083a15b82db1b54b48
parenta4050b871b9aa6065f8592b953d56c94c104ed30
parent0ac18b28cd112d217df577d846fb4a1de83fcc5f
Merge "fs_mgr: Adding logs when failing to wait for a device file" am: 4ca2a30368 am: 694985721f
am: 0ac18b28cd

Change-Id: I055425b0dfdbccbfa9c72e9bb1390ea483afdb9c
fs_mgr/fs_mgr.cpp
fs_mgr/fs_mgr_priv.h