diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-09-21 17:48:54 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-21 17:48:54 -0700 |
commit | 8bb850ab4c6d7c57a0a9e77d33e00f43a8876b76 (patch) | |
tree | f3de6b10b9c53a2562a33d16163a47e99e266303 /proprietary-blobs.txt | |
parent | 4698eeb91c0b77479767ee4c53dab92f668f7494 (diff) | |
parent | 554f66f1e840bd2accd0d35f1f73f302c637162e (diff) | |
download | device_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
Diffstat (limited to 'proprietary-blobs.txt')
0 files changed, 0 insertions, 0 deletions