diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-26 11:42:51 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-26 11:42:51 -0700 |
| commit | 80c27a3fff84aae529c574860d4e1664579ffeff (patch) | |
| tree | 95ad7ffa20a13a3f539413e6f64e8929d5506fd1 | |
| parent | d439e016ae69610cd5144e38397fa4dff76ba879 (diff) | |
| parent | 8ffd5f8087a380e1daa9000a12908f83d376a6da (diff) | |
| download | device_common-80c27a3fff84aae529c574860d4e1664579ffeff.zip device_common-80c27a3fff84aae529c574860d4e1664579ffeff.tar.gz device_common-80c27a3fff84aae529c574860d4e1664579ffeff.tar.bz2 | |
resolved conflicts for merge of 8ffd5f80 to jb-dev-mako
Change-Id: If3f1a761ea2403d4c58c3e34c07d1edaca4b0d72
| -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 6d74c16..07bac19 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -42,7 +42,7 @@ then fi shift -DEVICES="crespo wingray panda maguro grouper mako" +DEVICES="crespo crespo4g wingray panda maguro grouper mako" export LC_ALL=C repo sync -j32 -n |