diff options
| author | 2017-06-23 12:09:47 -0700 | |
|---|---|---|
| committer | 2017-06-23 12:09:47 -0700 | |
| commit | 091ff6c0e07393e3449d2c032573ece2ea8fe146 (patch) | |
| tree | 81f7d8760dddd69af983de96b520e5a5556ec61e | |
| parent | 41bf50cc8b40adc58f1e49bfebd408681389856f (diff) | |
| parent | 2e21f8d8cbbea272dd41afd4b4182b0d7a9c4955 (diff) | |
resolve merge conflicts of 2e21f8d8cbbe to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9c6e9a52e67a06c16b6c8fb6f8eb4647b2fec508
| -rw-r--r-- | core/jni/Android.bp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index f7bb7b4176ba..06e7424b3ba2 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -215,7 +215,6 @@ cc_library_shared { "libgif", "libseccomp_policy", "libselinux", - "libcrypto", "libgrallocusage", ], |