diff options
| author | dcashman <dcashman@google.com> | 2014-11-19 14:04:11 -0800 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2014-11-19 14:07:41 -0800 |
| commit | fe0d6cb8f723bc599bcc57cfd3a2f054ec54e042 (patch) | |
| tree | e395606ac28e2e7ab1838d2344ae7d5612437eb0 /tools/README | |
| parent | 6eabeb20f9e5aff2cd46c219903ea4479cc9f3e5 (diff) | |
| parent | 3a1eb33be6cd059ce57aa73d9f62613c476db4f3 (diff) | |
| download | android_external_sepolicy-fe0d6cb8f723bc599bcc57cfd3a2f054ec54e042.tar.gz android_external_sepolicy-fe0d6cb8f723bc599bcc57cfd3a2f054ec54e042.tar.bz2 android_external_sepolicy-fe0d6cb8f723bc599bcc57cfd3a2f054ec54e042.zip | |
resolved conflicts for merge of 3a1eb33b to lmp-mr1-dev-plus-aosp
Change-Id: I5cdc157157b6ed382e4827406bce7406fc2c3e3a
Diffstat (limited to 'tools/README')
| -rw-r--r-- | tools/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/README b/tools/README index 1ffe409..899b981 100644 --- a/tools/README +++ b/tools/README @@ -50,4 +50,4 @@ sepolicy-check sepolicy-analyze A tool for performing various kinds of analysis on a sepolicy - file.
\ No newline at end of file + file. |