diff options
author | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
---|---|---|
committer | Steve Kondik <shade@chemlab.org> | 2011-09-29 16:26:00 -0700 |
commit | 40d5df28bc4278d543697c960267ba3b5da74163 (patch) | |
tree | 4a1cae5501cb263d8b2fbd821ff0434bc7732809 /CleanSpec.mk | |
parent | 6ed844f1f2e3a53939b606011a76fb3e353a7a92 (diff) | |
parent | 50a83255d80f98b857c3f72dd2225d4bbc720ca3 (diff) | |
download | bionic-cm-7.1.0.zip bionic-cm-7.1.0.tar.gz bionic-cm-7.1.0.tar.bz2 |
Merge branch 'gingerbread' of git://git.omapzoom.org/platform/bionic into 237cm-7.1.0
Conflicts:
libc/Android.mk
libthread_db/Android.mk
Change-Id: I4a730f70bf3b31331ab9cee5f1a098d4162ef4b7
Diffstat (limited to 'CleanSpec.mk')
0 files changed, 0 insertions, 0 deletions