| commit | ebea86baf70c7963251e042d6740d678c8272f3e | [log] [tgz] |
|---|---|---|
| author | Jeff Vander Stoep <jeffv@google.com> | Sat Jul 08 04:58:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jul 08 04:58:29 2017 +0000 |
| tree | c8d401abb02d05fec2e0791ce9aea7227ed26c9f | |
| parent | f837f975d25be539096820f32d2c322fb2da1516 [diff] | |
| parent | 805ccb5ceee50c99a6557d02e0da5edc93ddb398 [diff] |
Merge changes from topic 'selinux-stage-merge' into stage-aosp-master am: e820c804c5 -s ours am: 805ccb5cee -s ours Change-Id: Ifbfab8a4bc26e3e1aaf9d75c9766046c50051d9a