summaryrefslogtreecommitdiffstats
path: root/self-extractors/nxp/LICENSE
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-10-03 11:26:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-03 11:26:33 -0700
commit5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1 (patch)
treec2351e30a2862752557eef3cff3513c070588c86 /self-extractors/nxp/LICENSE
parentff46ccfa5cf1e16d280843c31a4d0b95ed700d96 (diff)
parent834ce287666bf5809dc5be5c4b2a481f21fa7901 (diff)
downloaddevice_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.zip
device_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.tar.gz
device_samsung_maguro-5001fb6825f38c0e8d9f66535e01df0ed0f6b5c1.tar.bz2
am 834ce287: resolved conflicts for merge of 0f2c53e4 to jb-mr1-dev-plus-aosp
* commit '834ce287666bf5809dc5be5c4b2a481f21fa7901': Distributables for JZO54K for maguro
Diffstat (limited to 'self-extractors/nxp/LICENSE')
0 files changed, 0 insertions, 0 deletions