diff options
| author | dcashman <dcashman@google.com> | 2015-02-06 10:39:23 -0800 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-02-06 10:43:02 -0800 |
| commit | 880be4622536d86b3d2edc83b2b7de41fa8398c3 (patch) | |
| tree | 91070b751e27f742ce8b39658552ac1ea80e3a56 /file.te | |
| parent | 72fef0b10cf51b30426e7f049fb457972977625c (diff) | |
| parent | f82f5e01bf17d2856109f72659a3aead9e10b14f (diff) | |
| download | android_external_sepolicy-880be4622536d86b3d2edc83b2b7de41fa8398c3.tar.gz android_external_sepolicy-880be4622536d86b3d2edc83b2b7de41fa8398c3.tar.bz2 android_external_sepolicy-880be4622536d86b3d2edc83b2b7de41fa8398c3.zip | |
resolved conflicts for merge of f82f5e01 to lmp-mr1-dev.
Change-Id: I093d7ecf48e9137b974047cd7d0fd2209792b748
Diffstat (limited to 'file.te')
0 files changed, 0 insertions, 0 deletions