diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-11 15:09:35 +0200 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-11 15:09:35 +0200 |
commit | 26d74326d1ecdd7e71d23666c681a71943e18337 (patch) | |
tree | b4a34dff3d1901672883606ed7f376d4062975b1 /cm.dependencies | |
parent | e62de81f766b5082878ad1a6077d9a928bdf198e (diff) | |
parent | 708ac518e03a76536d31481b33222881a8ac9b03 (diff) | |
download | device_samsung_maguro-26d74326d1ecdd7e71d23666c681a71943e18337.zip device_samsung_maguro-26d74326d1ecdd7e71d23666c681a71943e18337.tar.gz device_samsung_maguro-26d74326d1ecdd7e71d23666c681a71943e18337.tar.bz2 |
Merge remote-tracking branch 'github/jellybean' into HEAD
Conflicts:
board-info.txt
factory-images/generate-factory-images-package.sh
full_maguro.mk
self-extractors/generate-packages.sh
Change-Id: I21cec77d8147f79aca11f27cff8a16562e9048ee
Diffstat (limited to 'cm.dependencies')
0 files changed, 0 insertions, 0 deletions