OSDN Git Service

am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile...
authorKenny Guy <kennyguy@google.com>
Fri, 16 Jan 2015 11:36:46 +0000 (11:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Jan 2015 11:36:46 +0000 (11:36 +0000)
commit2dc53c560bcba5d423eb4f87533897ac34047eee
tree11a86bc8ee8cd7fe6794b9a6cb9acf31e5d02982
parentd3ef970ca89f768550c8d54f8e2315a18178a200
parent4be433dc0b817fd4129e2bd99edb4c484f980600
am 4be433dc: am 10dd6eef: am fd846dfb: Merge "Sync file before using JournaledFile commit." into lmp-mr1-dev

* commit '4be433dc0b817fd4129e2bd99edb4c484f980600':
  Sync file before using JournaledFile commit.
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java