summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-21 15:14:26 -0700
committerJean-Baptiste Queru <jbq@google.com>2012-09-21 15:14:26 -0700
commita56b9f48d6204c44383220b574fa290a9aaabb1a (patch)
tree47de161311c70aad428c3891bd67af2c654d6e10
parente189fb463b42cb3fd59ffe901c1f2a0bceee827b (diff)
parent7464c1fa93f348f3f4fc8906e7cb8ecc65e5f0f8 (diff)
downloaddevice_samsung_maguro-a56b9f48d6204c44383220b574fa290a9aaabb1a.zip
device_samsung_maguro-a56b9f48d6204c44383220b574fa290a9aaabb1a.tar.gz
device_samsung_maguro-a56b9f48d6204c44383220b574fa290a9aaabb1a.tar.bz2
resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp
Change-Id: If76931ca5a3046cdfebf9b4e9fcbe638691ca65b
-rwxr-xr-xself-extractors/generate-packages.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index dd9e184..c07cfeb 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -33,6 +33,7 @@
# 397816 = JRO03B
# 398337 = JRO03C
# 405518 = JRO03H
+# 438695 = JRO03R
# 463694 = JZO54G
# end jb-dev
BRANCH=jb-dev