commit | bedbcad1de4a5d809e67e7a58000fbceb31dd732 | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 16:07:54 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 16:07:54 2017 +0000 |
tree | 0d46ff8fff09b5879bb0d09645aa626d6d4567c8 | |
parent | 3ac608fd1bf017f039afe8a57f57acd351f56186 [diff] | |
parent | 58dd12267117169fdf52f0c76ace3eed5eb74571 [diff] |
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