summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-02-10 13:33:28 +0100
committerAndrey Andreev <narf@bofh.bg>2012-02-10 13:33:28 +0100
commit6b7368f61761d8fd177ab752c6bea829f0ca2ea5 (patch)
treebc801f54de79a714f80ef2a38febe33cb7af9374 /system/core
parent8d7fffc9f0aa49d7bf306060f0676a7b28b7c808 (diff)
parent16af6afe991381360439135ddb0735dab1280fed (diff)
Merge remote-tracking branch 'upstream/develop' into develop-image-lib
Diffstat (limited to 'system/core')
0 files changed, 0 insertions, 0 deletions