diff options
| author | Ed Heyl <ed@google.com> | 2012-07-26 13:59:51 -0700 |
|---|---|---|
| committer | Ed Heyl <ed@google.com> | 2012-07-26 13:59:51 -0700 |
| commit | 946907b1dbb4a19dbd027c6955f036613f74af9d (patch) | |
| tree | cf172c9815c5bb5a7e5ffb0e4f9b1dcbd500b83c | |
| parent | 1db6a294ad4e5f10fffdf80ab5a1255b718108a6 (diff) | |
| parent | 35038d786749a44bef8991f052675baea5be28e6 (diff) | |
| download | device_common-946907b1dbb4a19dbd027c6955f036613f74af9d.zip device_common-946907b1dbb4a19dbd027c6955f036613f74af9d.tar.gz device_common-946907b1dbb4a19dbd027c6955f036613f74af9d.tar.bz2 | |
fix conflicts with merge of jb-dev-mako
Change-Id: I424e1fef73e3225e5b495b5974a3c9416be5797c
| -rwxr-xr-x | generate-blob-lists.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generate-blob-lists.sh b/generate-blob-lists.sh index cdf5df5..940e0a3 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -42,7 +42,7 @@ then fi shift -DEVICES="crespo crespo4g wingray panda maguro toro grouper manta" +DEVICES="crespo crespo4g wingray panda maguro toro grouper mako manta" export LC_ALL=C repo sync -j32 -n |