tree 214719e86b835ab282bd6e0efbd37ee495519165
parent 1fef485fcc307f12b5f4eb1c300012d956ebbf6c
parent 6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a
author JP Abgrall <jpa@google.com> 1392426080 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392426080 +0000

am 6e6140e0: am f7cf1a06: Merge "sdcard: direct I/O file access fix"

* commit '6e6140e0ad0575496cfbd6dd3c1eec5d53cb6e6a':
  sdcard: direct I/O file access fix