OSDN Git Service

Merge changes from topic 'am-02585df899244ddfb0b2ea27e62c017d'
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 16:15:38 +0000 (16:15 +0000)
commitb9d6ab67a467fe3ca905523a7cfd0ab5a4ec9528
tree0d46ff8fff09b5879bb0d09645aa626d6d4567c8
parenta6f8806b63e6a7deb215018c094cf6970635ab81
parent342f4de13badaa83ed8c24e18cdfd509e75d1da8
Merge changes from topic 'am-02585df899244ddfb0b2ea27e62c017d'

* changes:
  e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036 am: 3ac608fd1b  -s ours
  Require mke2fs.conf when building mke2fs am: 778eaa84a0 am: 6243f2136f  -s ours