summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-09-21 17:48:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-21 17:48:54 -0700
commit8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76 (patch)
treef3de6b10b9c53a2562a33d16163a47e99e266303
parent4698eeb91c0b77479767ee4c53dab92f668f7494 (diff)
parent554f66f1e840bd2accd0d35f1f73f302c637162e (diff)
downloaddevice_samsung_maguro-8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76.zip
device_samsung_maguro-8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76.tar.gz
device_samsung_maguro-8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76.tar.bz2
am 554f66f1: am a56b9f48: resolved conflicts for merge of 7464c1fa to jb-dev-plus-aosp
* commit '554f66f1e840bd2accd0d35f1f73f302c637162e': Self-extractors for JRO03R binaries for maguro
-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 5db2446..b1369bf 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
# start jb-mr1-dev