OSDN Git Service

Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 16:07:54 +0000 (16:07 +0000)
commitbedbcad1de4a5d809e67e7a58000fbceb31dd732
tree0d46ff8fff09b5879bb0d09645aa626d6d4567c8
parent3ac608fd1bf017f039afe8a57f57acd351f56186
parent58dd12267117169fdf52f0c76ace3eed5eb74571
Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1-dev-plus-aosp

* changes:
  e2fsdroid: use libselinux function to read file context on device am: 2fff6fb036
  Require mke2fs.conf when building mke2fs am: 778eaa84a0