diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-26 11:44:12 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-06-26 11:44:12 -0700 |
| commit | f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73 (patch) | |
| tree | 7fea88ebb106b73d66636e168125f5932759aa57 | |
| parent | a0991ecf777a62f43a8aeca838b85baef97b417f (diff) | |
| parent | 479368b43cc96ca3387c56304badd30fde219a50 (diff) | |
| download | device_common-f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73.zip device_common-f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73.tar.gz device_common-f3c660ceb3d7f63c85f61adb96c33b1f3a3bdf73.tar.bz2 | |
resolved conflicts for merge of 479368b4 to master
Change-Id: Ie000624d9b3f194d47fc506347c4e4ad5b19101b
| -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 a59eed3..cae5b74 100755 --- a/generate-blob-lists.sh +++ b/generate-blob-lists.sh @@ -42,7 +42,7 @@ then fi shift -DEVICES="crespo wingray panda maguro grouper manta" +DEVICES="crespo crespo4g wingray panda maguro grouper manta" export LC_ALL=C repo sync -j32 -n |