diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-12 09:21:59 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-04-12 09:21:59 -0700 |
| commit | 10df27a2b127322175bcf49a57ef8c7b0a2b2fcb (patch) | |
| tree | 16fe096a3a3649f37fb5bf4299ae5bd8d5e5b172 | |
| parent | 6d820c386f521231ba643c5be5599f9f64859df3 (diff) | |
| parent | 447b97434ae71a6e9b4b833468c1d705ad68a2b4 (diff) | |
| download | device_common-10df27a2b127322175bcf49a57ef8c7b0a2b2fcb.zip device_common-10df27a2b127322175bcf49a57ef8c7b0a2b2fcb.tar.gz device_common-10df27a2b127322175bcf49a57ef8c7b0a2b2fcb.tar.bz2 | |
resolved conflicts for merge of 447b9743 to master
Change-Id: Iffc8b1a0e373d5819948053610ac0b346f096172
| -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 62c62db..cd75be0 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -42,7 +42,7 @@ then fi shift -DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro manta" +DEVICES="crespo crespo4g stingray wingray panda toro torospr maguro grouper manta" export LC_ALL=C repo sync -j32 -n |