diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-10 13:53:17 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-12-10 13:53:17 -0800 |
| commit | 6c8de1b1beff59c47c67774d947b2a8b47384573 (patch) | |
| tree | 54ea59af34742bfe2a0916fa3e2ed6d0665915af /fastboot | |
| parent | 92e48de783a805d81a6584b2664304fb71eec2d4 (diff) | |
| parent | 4110da7522f25332fb0d2444932cb7c75112a7a3 (diff) | |
| download | system_core-6c8de1b1beff59c47c67774d947b2a8b47384573.zip system_core-6c8de1b1beff59c47c67774d947b2a8b47384573.tar.gz system_core-6c8de1b1beff59c47c67774d947b2a8b47384573.tar.bz2 | |
resolved conflicts for merge of c162dbb2 to master
Change-Id: If7ffc80560a807cb8e4338d42bec454f567fd9ad
Diffstat (limited to 'fastboot')
| -rw-r--r-- | fastboot/Android.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index f03bbea..aa5b14a 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -53,7 +53,6 @@ endif LOCAL_STATIC_LIBRARIES := \ $(EXTRA_STATIC_LIBS) \ libzipfile \ - libunz \ libext4_utils_host \ libsparse_host \ libz |