summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Heyl <ed@google.com>2011-12-02 04:46:33 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-12-02 04:46:33 -0800
commitf708af256ef1396ee164fbfd512ac853ddf32060 (patch)
tree6ca889bc643ea53b80ad285e9624f074f7d3531c
parent3dce3a0ab2f8d7d5911ae0ce1e0338e39e6128e1 (diff)
parenta50ab10135f2d47f50c68c9c8763812ca2bb8888 (diff)
downloaddevice_samsung_maguro-f708af256ef1396ee164fbfd512ac853ddf32060.zip
device_samsung_maguro-f708af256ef1396ee164fbfd512ac853ddf32060.tar.gz
device_samsung_maguro-f708af256ef1396ee164fbfd512ac853ddf32060.tar.bz2
am a50ab101: resolve conflict w/270d61
* commit 'a50ab10135f2d47f50c68c9c8763812ca2bb8888': require bootloader KL01
-rw-r--r--board-info.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/board-info.txt b/board-info.txt
index 4e8fcae..7c9f75e 100644
--- a/board-info.txt
+++ b/board-info.txt
@@ -1,4 +1,4 @@
require board=tuna
-require version-bootloader=PRIMEKJ10|PRIMEKK15
+require version-bootloader=PRIMEKJ10|PRIMEKL01
require version-baseband=I9250XXKK1|I9250XXKK6